소스 검색

*** empty log message ***

David Rose 25 년 전
부모
커밋
4d9ab7f0c7
1개의 변경된 파일20개의 추가작업 그리고 12개의 파일을 삭제
  1. 20 12
      pandatool/src/egg-palettize/eggFile.cxx

+ 20 - 12
pandatool/src/egg-palettize/eggFile.cxx

@@ -327,18 +327,26 @@ choose_placements() {
       // Now groups is the set of groups that the egg file requires,
       // which also happen to include the texture.  It better not be
       // empty.
-      nassertv(!groups.empty());
-      
-      // It doesn't really matter which group in the set we choose, so
-      // we arbitrarily choose the first one.
-      PaletteGroup *group = (*groups.begin());
-
-      // Now get the TexturePlacement object that corresponds to the
-      // placement of this texture into this group.
-      TexturePlacement *placement = texture->get_placement(group);
-      nassertv(placement != (TexturePlacement *)NULL);
-      
-      reference->set_placement(placement);
+      if (groups.empty()) {
+	nout << "Warning!  Egg file " << get_name() << ", referencing texture "
+	     << *reference << ", does not have any groups in common.\n"
+	     << "Egg groups:\n";
+	get_complete_groups().write(nout, 2);
+	nout << "Texture groups:\n";
+	texture->get_groups().write(nout, 2);
+
+      } else {
+	// It doesn't really matter which group in the set we choose, so
+	// we arbitrarily choose the first one.
+	PaletteGroup *group = (*groups.begin());
+
+	// Now get the TexturePlacement object that corresponds to the
+	// placement of this texture into this group.
+	TexturePlacement *placement = texture->get_placement(group);
+	nassertv(placement != (TexturePlacement *)NULL);
+	
+	reference->set_placement(placement);
+      }
     }
   }
 }