Преглед изворни кода

renames the engine method arg to avoid name confusion.

Areloch пре 9 година
родитељ
комит
af2ac4472e
1 измењених фајлова са 3 додато и 3 уклоњено
  1. 3 3
      Engine/source/gui/editor/guiInspector.cpp

+ 3 - 3
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"
 	"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;