mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-12 07:04:36 +00:00
Merge pull request #2354 from Areloch/isRenderEnabledOptimization
Modification of #2145
This commit is contained in:
commit
bc8204a201
1 changed files with 11 additions and 2 deletions
|
|
@ -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;
|
||||||
|
|
@ -763,8 +766,14 @@ void SceneObject::onCameraScopeQuery( NetConnection* connection, CameraScopeQuer
|
||||||
|
|
||||||
bool SceneObject::isRenderEnabled() const
|
bool SceneObject::isRenderEnabled() const
|
||||||
{
|
{
|
||||||
AbstractClassRep *classRep = getClassRep();
|
#ifdef TORQUE_TOOLS
|
||||||
return ( mObjectFlags.test( RenderEnabledFlag ) && classRep->isRenderEnabled() );
|
if (gEditingMission)
|
||||||
|
{
|
||||||
|
AbstractClassRep *classRep = getClassRep();
|
||||||
|
return (mObjectFlags.test(RenderEnabledFlag) && classRep->isRenderEnabled());
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return (mObjectFlags.test(RenderEnabledFlag));
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue