*** empty log message ***

pandatool/src/flt/fltTexture.cxx

@@ -324,34 +324,37 @@ unpack_attr(const Datagram &datagram) {
   iterator.skip_bytes(4 + 4 + 149 * 4);
   iterator.skip_bytes(8);  // Undocumented padding.
   _comment = iterator.get_fixed_string(512);
-  iterator.skip_bytes(13 * 4);
-  iterator.skip_bytes(4);  // Undocumented padding.
-  _file_version = iterator.get_be_int32();
-
-  // Now read the geospecific control points.
-  _geospecific_control_points.clear();
-  int num_points = iterator.get_be_int32();
-  if (num_points > 0) {
-    iterator.skip_bytes(4);
-
-    while (num_points > 0) {
-      GeospecificControlPoint gcp;
-      gcp._uv[0] = iterator.get_be_float64();
-      gcp._uv[1] = iterator.get_be_float64();
-      gcp._real_earth[0] = iterator.get_be_float64();
-      gcp._real_earth[1] = iterator.get_be_float64();
-    }
-  }
 
   if (iterator.get_remaining_size() != 0) {
-    int num_defs = iterator.get_be_int32();
-    while (num_defs > 0) {
-      SubtextureDef def;
-      def._name = iterator.get_fixed_string(32);
-      def._left = iterator.get_be_int32();
-      def._bottom = iterator.get_be_int32();
-      def._right = iterator.get_be_int32();
-      def._top = iterator.get_be_int32();
+    iterator.skip_bytes(13 * 4);
+    iterator.skip_bytes(4);  // Undocumented padding.
+    _file_version = iterator.get_be_int32();
+    
+    // Now read the geospecific control points.
+    _geospecific_control_points.clear();
+    int num_points = iterator.get_be_int32();
+    if (num_points > 0) {
+      iterator.skip_bytes(4);
+      
+      while (num_points > 0) {
+	GeospecificControlPoint gcp;
+	gcp._uv[0] = iterator.get_be_float64();
+	gcp._uv[1] = iterator.get_be_float64();
+	gcp._real_earth[0] = iterator.get_be_float64();
+	gcp._real_earth[1] = iterator.get_be_float64();
+      }
+    }
+
+    if (iterator.get_remaining_size() != 0) {
+      int num_defs = iterator.get_be_int32();
+      while (num_defs > 0) {
+	SubtextureDef def;
+	def._name = iterator.get_fixed_string(32);
+	def._left = iterator.get_be_int32();
+	def._bottom = iterator.get_be_int32();
+	def._right = iterator.get_be_int32();
+	def._top = iterator.get_be_int32();
+      }
     }
   }
 

pandatool/src/fltegg/fltToEggConverter.cxx

@@ -200,7 +200,6 @@ void FltToEggConverter::
 convert_bead_id(const FltBeadID *flt_bead, FltToEggLevelState &state) {
   nout << "Don't know how to convert beads of type " << flt_bead->get_type()
        << "\n";
-  exit(1);
   EggGroup *egg_group = new EggGroup(flt_bead->get_id());
   state._egg_parent->add_child(egg_group);
 
@@ -222,7 +221,6 @@ void FltToEggConverter::
 convert_bead(const FltBead *flt_bead, FltToEggLevelState &state) {
   nout << "Don't know how to convert beads of type " << flt_bead->get_type()
        << "\n";
-  exit(1);
   EggGroup *egg_group = new EggGroup;
   state._egg_parent->add_child(egg_group);
 
@@ -611,9 +609,7 @@ convert_path(const Filename &orig_filename, const Filename &as_found,
   switch (path_convert) {
   case PC_relative:
     result = as_found;
-    if (!result.make_relative_to(rel_dir)) {
-      nout << "Cannot make " << result << " relative to " << rel_dir << "\n";
-    }
+    result.make_relative_to(rel_dir);
     return result;
 
   case PC_absolute:
@@ -627,9 +623,7 @@ convert_path(const Filename &orig_filename, const Filename &as_found,
 
   case PC_rel_abs:
     result = as_found;
-    if (!result.make_relative_to(rel_dir)) {
-      nout << "Cannot make " << result << " relative to " << rel_dir << "\n";
-    }
+    result.make_relative_to(rel_dir);
     result = Filename(rel_dir, result);
     return result;
 

pandatool/src/fltprogs/Sources.pp

@@ -26,7 +26,7 @@
 
 #end bin_target
 
-#begin noinst_bin_target
+#begin bin_target
   #define TARGET flt2egg
   #define LOCAL_LIBS flt fltegg eggbase progbase
 
@@ -39,4 +39,4 @@
   #define SOURCES \
     fltToEgg.cxx fltToEgg.h
 
-#end noinst_bin_target
+#end bin_target

pandatool/src/fltprogs/fltToEgg.cxx

@@ -139,6 +139,7 @@ run() {
   }
 
   write_egg_file();
+  nout << "\n";
 }