Browse Source

Merge pull request #2354 from Areloch/isRenderEnabledOptimization

Modification of #2145
Areloch 6 years ago
parent
commit
bc8204a201
1 changed files with 11 additions and 2 deletions
  1. 11 2
      Engine/source/scene/sceneObject.cpp

+ 11 - 2
Engine/source/scene/sceneObject.cpp

@@ -93,6 +93,9 @@ ConsoleDocClass( SceneObject,
    "@ingroup gameObjects\n"
 );
 
+#ifdef TORQUE_TOOLS
+extern bool gEditingMission;
+#endif
 
 Signal< void( SceneObject* ) > SceneObject::smSceneObjectAdd;
 Signal< void( SceneObject* ) > SceneObject::smSceneObjectRemove;
@@ -763,8 +766,14 @@ void SceneObject::onCameraScopeQuery( NetConnection* connection, CameraScopeQuer
 
 bool SceneObject::isRenderEnabled() const
 {
-   AbstractClassRep *classRep = getClassRep();
-   return ( mObjectFlags.test( RenderEnabledFlag ) && classRep->isRenderEnabled() );
+#ifdef TORQUE_TOOLS
+	if (gEditingMission)
+	{
+		AbstractClassRep *classRep = getClassRep();
+		return (mObjectFlags.test(RenderEnabledFlag) && classRep->isRenderEnabled());
+	}
+#endif
+	return (mObjectFlags.test(RenderEnabledFlag));
 }
 
 //-----------------------------------------------------------------------------