From af2ac4472e3c3393a170dc231f04eb0a6c856e8d Mon Sep 17 00:00:00 2001 From: Areloch Date: Wed, 14 Sep 2016 19:42:05 -0500 Subject: [PATCH] renames the engine method arg to avoid name confusion. --- Engine/source/gui/editor/guiInspector.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Engine/source/gui/editor/guiInspector.cpp b/Engine/source/gui/editor/guiInspector.cpp index c1f54a24d..77ab67365 100644 --- a/Engine/source/gui/editor/guiInspector.cpp +++ b/Engine/source/gui/editor/guiInspector.cpp @@ -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" "@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.") { - if ( !object ) + if ( !obj) return NULL; - SimObject *inspector = GuiInspector::findByObject( object ); + SimObject *inspector = GuiInspector::findByObject(obj); if ( !inspector ) return NULL;