TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-10 22:24:33 +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

3
Engine/source/console/simObject.cpp
View file

@ -57,6 +57,8 @@ SimObjectId SimObject::smForcedId = 0;
bool SimObject::preventNameChanging = false;
IMPLEMENT_CALLBACK(SimObject, onInspectPostApply, void, (SimObject* obj), (obj), "Generic callback for when an object is edited");
namespace Sim
{
// Defined in simManager.cpp
@ -2238,6 +2240,7 @@ void SimObject::inspectPreApply()
void SimObject::inspectPostApply()
{
onInspectPostApply_callback(this);
}
//-----------------------------------------------------------------------------

1
Engine/source/console/simObject.h
View file

@ -965,6 +965,7 @@ class SimObject: public ConsoleObject, public TamlCallbacks
virtual void getConsoleMethodData(const char * fname, S32 routingId, S32 * type, S32 * minArgs, S32 * maxArgs, void ** callback, const char ** usage) {}
DECLARE_CONOBJECT( SimObject );
DECLARE_CALLBACK(void, onInspectPostApply, (SimObject* obj));
static SimObject* __findObject( const char* id ) { return Sim::findObject( id ); }
static const char* __getObjectId( ConsoleObject* object )