|
@@ -4881,17 +4881,18 @@ DefineEngineMethod( ShapeBase, getTargetCount, S32, (),,
|
|
|
|
|
|
"@see getTargetName()\n")
|
|
|
{
|
|
|
- ShapeBase *obj = dynamic_cast< ShapeBase* > ( object );
|
|
|
- if(obj)
|
|
|
- {
|
|
|
- // Try to use the client object (so we get the reskinned targets in the Material Editor)
|
|
|
- if ((ShapeBase*)obj->getClientObject())
|
|
|
- obj = (ShapeBase*)obj->getClientObject();
|
|
|
+ ShapeBase *obj = dynamic_cast< ShapeBase* > ( object );
|
|
|
+ if(obj)
|
|
|
+ {
|
|
|
+ // Try to use the client object (so we get the reskinned targets in the Material Editor)
|
|
|
+ if ((ShapeBase*)obj->getClientObject())
|
|
|
+ obj = (ShapeBase*)obj->getClientObject();
|
|
|
|
|
|
- return obj->getShapeInstance()->getTargetCount();
|
|
|
+ if (obj->getShapeInstance() != NULL)
|
|
|
+ return obj->getShapeInstance()->getTargetCount();
|
|
|
}
|
|
|
-
|
|
|
- return -1;
|
|
|
+
|
|
|
+ return -1;
|
|
|
}
|
|
|
|
|
|
DefineEngineMethod( ShapeBase, changeMaterial, void, ( const char* mapTo, Material* oldMat, Material* newMat ),,
|