diff --git a/Engine/source/gui/worldEditor/worldEditor.cpp b/Engine/source/gui/worldEditor/worldEditor.cpp index 087256f31..7708feb79 100644 --- a/Engine/source/gui/worldEditor/worldEditor.cpp +++ b/Engine/source/gui/worldEditor/worldEditor.cpp @@ -3753,18 +3753,18 @@ void WorldEditor::explodeSelectedPrefab() setDirty(); } -void WorldEditor::bakeSelectionToMesh(const char *filename) +void WorldEditor::makeSelectionAMesh(const char *filename) { if (mSelected->size() == 0) { - Con::errorf("WorldEditor::makeSelectionPrefab - Nothing selected."); + Con::errorf("WorldEditor::makeSelectionAMesh - Nothing selected."); return; } SimGroup *missionGroup; if (!Sim::findObject("MissionGroup", missionGroup)) { - Con::errorf("WorldEditor::makeSelectionPrefab - Could not find MissionGroup."); + Con::errorf("WorldEditor::makeSelectionAMesh - Could not find MissionGroup."); return; } @@ -3918,11 +3918,11 @@ DefineEngineMethod( WorldEditor, explodeSelectedPrefab, void, (),, 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." "@param filename collada file to save the selected objects to.") { - object->bakeSelectionToMesh(filename); + object->makeSelectionAMesh(filename); } DefineEngineMethod( WorldEditor, mountRelative, void, ( SceneObject *objA, SceneObject *objB ),, diff --git a/Engine/source/gui/worldEditor/worldEditor.h b/Engine/source/gui/worldEditor/worldEditor.h index 35290ca40..f1c231ee9 100644 --- a/Engine/source/gui/worldEditor/worldEditor.h +++ b/Engine/source/gui/worldEditor/worldEditor.h @@ -117,7 +117,7 @@ class WorldEditor : public EditTSCtrl void makeSelectionPrefab( const char *filename ); void explodeSelectedPrefab(); - void bakeSelectionToMesh(const char *filename); + void makeSelectionAMesh(const char *filename); // static SceneObject* getClientObj(SceneObject *); diff --git a/Templates/Full/game/tools/worldEditor/scripts/menuHandlers.ed.cs b/Templates/Full/game/tools/worldEditor/scripts/menuHandlers.ed.cs index 1823e0d55..f476ccaeb 100644 --- a/Templates/Full/game/tools/worldEditor/scripts/menuHandlers.ed.cs +++ b/Templates/Full/game/tools/worldEditor/scripts/menuHandlers.ed.cs @@ -555,7 +555,7 @@ function EditorExplodePrefab() EditorTree.buildVisibleTree( true ); } -function bakeSelectedToMesh() +function makeSelectedAMesh() { %dlg = new SaveFileDialog() @@ -582,7 +582,7 @@ function bakeSelectedToMesh() if ( !%ret ) return; - EWorldEditor.bakeSelectionToMesh( %saveFile ); + EWorldEditor.makeSelectionAMesh( %saveFile ); EditorTree.buildVisibleTree( true ); } diff --git a/Templates/Full/game/tools/worldEditor/scripts/menus.ed.cs b/Templates/Full/game/tools/worldEditor/scripts/menus.ed.cs index 976d3c08b..0558d93db 100644 --- a/Templates/Full/game/tools/worldEditor/scripts/menus.ed.cs +++ b/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[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());