TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 00:54:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modification of #2145

Browse source 
Original PR broke class-type visibility toggles in the editor, so this adjustment on the same setup keeps the optimized path, but also enables the original class-based render toggle if the editor is open.
(Also adds TORQUE_TOOLS check to have it be even leaner if the project doesn't have tool support at all)
This commit is contained in:
Areloch 2019-04-08 10:20:13 -05:00
parent a481d35b10
commit c622cfcb6b
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Engine/source/scene/sceneObject.cpp
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));
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------