mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-03-20 12:50:57 +00:00
backup
WeakRefBase is now threadsafe and uses an actual weak_ptr to drive its logic, strongrefbase is next.
This commit is contained in:
parent
1fed963d82
commit
f1f09efbfa
6 changed files with 120 additions and 62 deletions
|
|
@ -46,6 +46,7 @@
|
|||
#include "scene/sceneObject.h"
|
||||
#include "T3D/camera.h"
|
||||
#include "T3D/player.h"
|
||||
#include "T3D/gameBase/gameConnection.h"
|
||||
|
||||
ImplementBitfieldType(GameTypeMasksType,
|
||||
"The type of animation effect to apply to this material.\n"
|
||||
|
|
@ -725,9 +726,7 @@ bool SimObject::registerObject()
|
|||
AssertFatal(Sim::gIdDictionary && Sim::gNameDictionary,
|
||||
"SimObject::registerObject - tried to register an object before Sim::init()!");
|
||||
|
||||
|
||||
if (true && dynamic_cast<SceneObject*>(this) &&
|
||||
!(dynamic_cast<Camera*>(this) || dynamic_cast<Player*>(this)) &&
|
||||
if (Sim::sgStreamingInstance->smStreaming && dynamic_cast<SceneObject*>(this) &&
|
||||
!gEditingMission
|
||||
)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue