From 835edb8b4adec5abbc69334e560ced3bf38d36ec Mon Sep 17 00:00:00 2001 From: "Asad M. Zaman" Date: Wed, 10 Dec 2003 00:41:30 +0000 Subject: [PATCH] fixes cubes animation with joint-scale named nodes --- pandatool/src/softegg/softNodeDesc.cxx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pandatool/src/softegg/softNodeDesc.cxx b/pandatool/src/softegg/softNodeDesc.cxx index 731d8c2af1..0010805c9e 100755 --- a/pandatool/src/softegg/softNodeDesc.cxx +++ b/pandatool/src/softegg/softNodeDesc.cxx @@ -365,9 +365,12 @@ set_parentJoint(SAA_Scene *scene, SoftNodeDesc *lastJoint) { lastJoint = this; } if ( _parentJoint && strstr( _parentJoint->get_name().c_str(), "scale" ) != NULL ) { - _parentJoint = NULL; - // _parentJoint = lastJoint = NULL; - softegg_cat.spam() << "scale joint flag set!\n"; + // make sure _parentJoint didn't have the name "joint" in it + if (strstr(_parentJoint->get_name().c_str(), "joint") == NULL) { + _parentJoint = NULL; + // _parentJoint = lastJoint = NULL; + softegg_cat.spam() << "scale joint flag set!\n"; + } } // look in the children