TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-22 21:05:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'alpha40_HiddenHugs' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups

Browse source
This commit is contained in:
Areloch 2020-05-16 02:17:24 -05:00
commit 2c2c9659e1
5 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/scene/sceneObject.cpp
View file

@ -93,7 +93,6 @@ ConsoleDocClass( SceneObject,
"@ingroup gameObjects\n"
);
IMPLEMENT_CALLBACK(SceneObject, onInspectPostApply, void, (SceneObject* obj), (obj),"Generic callback for when an object is edited");
#ifdef TORQUE_TOOLS
extern bool gEditingMission;
#endif
@ -387,7 +386,6 @@ void SceneObject::inspectPostApply()
{
if( isServerObject() )
setMaskBits( MountedMask );
onInspectPostApply_callback(this);
Parent::inspectPostApply();
}

1
Engine/source/scene/sceneObject.h
View file

@ -798,7 +798,6 @@ class SceneObject : public NetObject, private SceneContainer::Link, public Proce
static bool _setGameObject(void* object, const char* index, const char* data);
DECLARE_CONOBJECT( SceneObject );
DECLARE_CALLBACK(void, onInspectPostApply, (SceneObject* obj));
private:
SceneObject( const SceneObject& ); ///< @deprecated disallowed