From 7ca8c09296e9005ea005d5d15f009ac93ca4d600 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 14 May 2001 23:39:25 +0000
Subject: [PATCH] *** empty log message ***

---
 panda/src/char/character.cxx      | 2 +-
 panda/src/framework/framework.cxx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/panda/src/char/character.cxx b/panda/src/char/character.cxx
index 389fe6713c..27a7790ec4 100644
--- a/panda/src/char/character.cxx
+++ b/panda/src/char/character.cxx
@@ -30,7 +30,7 @@ PStatCollector Character::_anim_pcollector("App:Animation", RGBColorf(1,0,1), 30
 ////////////////////////////////////////////////////////////////////
 Character::
 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)),
   _computed_vertices(copy._computed_vertices),
   _parts(copy._parts),
diff --git a/panda/src/framework/framework.cxx b/panda/src/framework/framework.cxx
index 88693f765f..c5b146bfd3 100644
--- a/panda/src/framework/framework.cxx
+++ b/panda/src/framework/framework.cxx
@@ -994,7 +994,7 @@ int framework_main(int argc, char *argv[]) {
 			 pFileCollection = &grided_files;
 
 			 char *pStr=(argv[a])+2;
-			 if(*pStr!=NULL) {
+			 if (*pStr != '\0') {
 				 gridrepeats=atoi(pStr);
 				 if(gridrepeats<1)
 					 gridrepeats=1;