Skip to content

Commit

Permalink
Tweaked the naming convention to a) be more in line with the prefab c…
Browse files Browse the repository at this point in the history
…reation functions, and b) avoid common artist terminologies that may lead to confusion on what it does.
  • Loading branch information
Areloch committed Dec 12, 2016
1 parent 8ec88a2 commit eb2d3a9
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions Engine/source/gui/worldEditor/worldEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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 ),,
Expand Down
2 changes: 1 addition & 1 deletion Engine/source/gui/worldEditor/worldEditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ function EditorExplodePrefab()
EditorTree.buildVisibleTree( true );
}

function bakeSelectedToMesh()
function makeSelectedAMesh()
{

%dlg = new SaveFileDialog()
Expand All @@ -582,7 +582,7 @@ function bakeSelectedToMesh()
if ( !%ret )
return;

EWorldEditor.bakeSelectionToMesh( %saveFile );
EWorldEditor.makeSelectionAMesh( %saveFile );

EditorTree.buildVisibleTree( true );
}
Expand Down
2 changes: 1 addition & 1 deletion Templates/Full/game/tools/worldEditor/scripts/menus.ed.cs
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ class = "EditorUtilitiesMenu";

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());

Expand Down

0 comments on commit eb2d3a9

Please sign in to comment.