Merge pull request #2354 from Areloch/isRenderEnabledOptimization

Modification of #2145
This commit is contained in:
Areloch 2019-04-20 01:45:27 -05:00 committed by GitHub
commit 534746b8fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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));
}
//-----------------------------------------------------------------------------