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

Merge pull request #1773 from Areloch/findByObjectFix

Browse source 
GuiInspector's findByObject method fix.
This commit is contained in:
Areloch 2016-11-23 00:30:55 -06:00 • committed by GitHub
commit 48610d2eb1
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/gui/editor/guiInspector.cpp
View file

@ -921,15 +921,15 @@ DefineEngineMethod( GuiInspector, setObjectField, void, (const char* fieldname,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
DefineEngineMethod( GuiInspector, findByObject, S32, (SimObject* object), , DefineEngineMethod( GuiInspector, findByObject, S32, (SimObject* obj), ,
"Returns the id of an awake inspector that is inspecting the passed object if one exists\n" "Returns the id of an awake inspector that is inspecting the passed object if one exists\n"
"@param object Object to find away inspector for." "@param object Object to find away inspector for."
"@return id of an awake inspector that is inspecting the passed object if one exists, else NULL or 0.") "@return id of an awake inspector that is inspecting the passed object if one exists, else NULL or 0.")
{ {
if ( !object ) if ( !obj)
return NULL; return NULL;
SimObject *inspector = GuiInspector::findByObject( object ); SimObject *inspector = GuiInspector::findByObject(obj);
if ( !inspector ) if ( !inspector )
return NULL; return NULL;