瀏覽代碼

*** empty log message ***

David Rose 24 年之前
父節點
當前提交
7ca8c09296
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      panda/src/char/character.cxx
  2. 1 1
      panda/src/framework/framework.cxx

+ 1 - 1
panda/src/char/character.cxx

@@ -30,7 +30,7 @@ PStatCollector Character::_anim_pcollector("App:Animation", RGBColorf(1,0,1), 30
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 Character::
 Character::
 Character(const Character &copy) : 
 Character(const Character &copy) : 
-  PartBundleNode(copy.get_name(), new CharacterJointBundle(copy.get_name())),
+  PartBundleNode(copy.get_name(), new CharacterJointBundle(copy.get_bundle()->get_name())),
   _cv(DynamicVertices::deep_copy(copy._cv)),
   _cv(DynamicVertices::deep_copy(copy._cv)),
   _computed_vertices(copy._computed_vertices),
   _computed_vertices(copy._computed_vertices),
   _parts(copy._parts),
   _parts(copy._parts),

+ 1 - 1
panda/src/framework/framework.cxx

@@ -994,7 +994,7 @@ int framework_main(int argc, char *argv[]) {
 			 pFileCollection = &grided_files;
 			 pFileCollection = &grided_files;
 
 
 			 char *pStr=(argv[a])+2;
 			 char *pStr=(argv[a])+2;
-			 if(*pStr!=NULL) {
+			 if (*pStr != '\0') {
 				 gridrepeats=atoi(pStr);
 				 gridrepeats=atoi(pStr);
 				 if(gridrepeats<1)
 				 if(gridrepeats<1)
 					 gridrepeats=1;
 					 gridrepeats=1;