Browse Source

Tweaked the naming convention to a) be more in line with the prefab creation functions, and b) avoid common artist terminologies that may lead to confusion on what it does.

Areloch 8 years ago
parent
commit
eb2d3a908a

+ 5 - 5
Engine/source/gui/worldEditor/worldEditor.cpp

@@ -3753,18 +3753,18 @@ void WorldEditor::explodeSelectedPrefab()
    setDirty();
    setDirty();
 }
 }
 
 
-void WorldEditor::bakeSelectionToMesh(const char *filename)
+void WorldEditor::makeSelectionAMesh(const char *filename)
 {
 {
    if (mSelected->size() == 0)
    if (mSelected->size() == 0)
    {
    {
-      Con::errorf("WorldEditor::makeSelectionPrefab - Nothing selected.");
+      Con::errorf("WorldEditor::makeSelectionAMesh - Nothing selected.");
       return;
       return;
    }
    }
 
 
    SimGroup *missionGroup;
    SimGroup *missionGroup;
    if (!Sim::findObject("MissionGroup", missionGroup))
    if (!Sim::findObject("MissionGroup", missionGroup))
    {
    {
-      Con::errorf("WorldEditor::makeSelectionPrefab - Could not find MissionGroup.");
+      Con::errorf("WorldEditor::makeSelectionAMesh - Could not find MissionGroup.");
       return;
       return;
    }
    }
 
 
@@ -3918,11 +3918,11 @@ DefineEngineMethod( WorldEditor, explodeSelectedPrefab, void, (),,
    object->explodeSelectedPrefab();
    object->explodeSelectedPrefab();
 }
 }
 
 
-DefineEngineMethod(WorldEditor, bakeSelectionToMesh, void, (const char* filename), ,
+DefineEngineMethod(WorldEditor, makeSelectionAMesh, void, (const char* filename), ,
    "Save selected objects to a .dae collada file and replace them in the level with a TSStatic object."
    "Save selected objects to a .dae collada file and replace them in the level with a TSStatic object."
    "@param filename collada file to save the selected objects to.")
    "@param filename collada file to save the selected objects to.")
 {
 {
-   object->bakeSelectionToMesh(filename);
+   object->makeSelectionAMesh(filename);
 }
 }
 
 
 DefineEngineMethod( WorldEditor, mountRelative, void, ( SceneObject *objA, SceneObject *objB ),,
 DefineEngineMethod( WorldEditor, mountRelative, void, ( SceneObject *objA, SceneObject *objB ),,

+ 1 - 1
Engine/source/gui/worldEditor/worldEditor.h

@@ -117,7 +117,7 @@ class WorldEditor : public EditTSCtrl
       void makeSelectionPrefab( const char *filename );
       void makeSelectionPrefab( const char *filename );
       void explodeSelectedPrefab();
       void explodeSelectedPrefab();
 
 
-      void bakeSelectionToMesh(const char *filename);
+      void makeSelectionAMesh(const char *filename);
 
 
       //
       //
       static SceneObject* getClientObj(SceneObject *);
       static SceneObject* getClientObj(SceneObject *);

+ 2 - 2
Templates/Full/game/tools/worldEditor/scripts/menuHandlers.ed.cs

@@ -555,7 +555,7 @@ function EditorExplodePrefab()
    EditorTree.buildVisibleTree( true );
    EditorTree.buildVisibleTree( true );
 }
 }
 
 
-function bakeSelectedToMesh()
+function makeSelectedAMesh()
 {
 {
 
 
    %dlg = new SaveFileDialog()
    %dlg = new SaveFileDialog()
@@ -582,7 +582,7 @@ function bakeSelectedToMesh()
    if ( !%ret )
    if ( !%ret )
       return;
       return;
    
    
-   EWorldEditor.bakeSelectionToMesh( %saveFile );    
+   EWorldEditor.makeSelectionAMesh( %saveFile );    
    
    
    EditorTree.buildVisibleTree( true );  
    EditorTree.buildVisibleTree( true );  
 }
 }

+ 1 - 1
Templates/Full/game/tools/worldEditor/scripts/menus.ed.cs

@@ -263,7 +263,7 @@ function EditorGui::buildMenus(%this)
          
          
       item[0] = "Network Graph" TAB "n" TAB "toggleNetGraph();";
       item[0] = "Network Graph" TAB "n" TAB "toggleNetGraph();";
       item[1] = "Profiler" TAB "ctrl F2" TAB "showMetrics(true);";
       item[1] = "Profiler" TAB "ctrl F2" TAB "showMetrics(true);";
-      item[2] = "Bake Selected to Mesh" TAB "" TAB "bakeSelectedToMesh();";
+      item[2] = "Make Selected a Mesh" TAB "" TAB "makeSelectedAMesh();";
    };
    };
    %this.menuBar.insert(%toolsMenu, %this.menuBar.getCount());
    %this.menuBar.insert(%toolsMenu, %this.menuBar.getCount());