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 bc8204a201

View file

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