浏览代码

Select camera when in material editor crashfix.

When attempting to select a camera Object(so going into the editor, going into the freefloating camera and then back to the player camera and selecting the freefloating one) while the material editor was open, it would crash because it attempts to access the shapebase object's shapeInstance - but cameras don't have a shape.

This fixes it so it makes sure there's a shapeinstance before trying to get the material data.
Areloch 9 年之前
父节点
当前提交
3a99541541
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      Engine/source/T3D/shapeBase.cpp

+ 2 - 1
Engine/source/T3D/shapeBase.cpp

@@ -4888,7 +4888,8 @@ DefineEngineMethod( ShapeBase, getTargetCount, S32, (),,
 		if ((ShapeBase*)obj->getClientObject())
 			obj = (ShapeBase*)obj->getClientObject();
 
-		return obj->getShapeInstance()->getTargetCount();
+      if (obj->getShapeInstance() != NULL)
+		   return obj->getShapeInstance()->getTargetCount();
 	}
 
 	return -1;