quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix the last commit

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@146 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-01-01 14:13:27 +00:00
parent c8a08caf81
commit 59c333f44b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
radiant/mainframe.cpp
View File

@ -1186,9 +1186,9 @@ void SelectFaceMode()
class CloneSelected : public scene::Graph::Walker class CloneSelected : public scene::Graph::Walker
{ {
bool doFixNames; bool doMakeUnique;
public: public:
CloneSelected(bool d): doFixNames(d) { } CloneSelected(bool d): doMakeUnique(d) { }
bool pre(const scene::Path& path, scene::Instance& instance) const bool pre(const scene::Path& path, scene::Instance& instance) const
{ {
if(path.size() == 1) if(path.size() == 1)
@ -1218,6 +1218,7 @@ public:
&& selectable->isSelected()) && selectable->isSelected())
{ {
NodeSmartReference clone(Node_Clone(path.top())); NodeSmartReference clone(Node_Clone(path.top()));
if(doMakeUnique)
Map_gatherNamespaced(clone); Map_gatherNamespaced(clone);
Node_getTraversable(path.parent().get())->insert(clone); Node_getTraversable(path.parent().get())->insert(clone);
} }
@ -1225,9 +1226,9 @@ public:
} }
}; };
void Scene_Clone_Selected(scene::Graph& graph, bool doFixNames) void Scene_Clone_Selected(scene::Graph& graph, bool doMakeUnique)
{ {
graph.traverse(CloneSelected(doFixNames)); graph.traverse(CloneSelected(doMakeUnique));
Map_mergeClonedNames(); Map_mergeClonedNames();
} }
@ -1306,11 +1307,11 @@ void Selection_Clone()
} }
} }
void Selection_Clone_FixNames() void Selection_Clone_MakeUnique()
{ {
if(GlobalSelectionSystem().Mode() == SelectionSystem::ePrimitive) if(GlobalSelectionSystem().Mode() == SelectionSystem::ePrimitive)
{ {
UndoableCommand undo("cloneSelected"); UndoableCommand undo("cloneSelectedMakeUnique");
Scene_Clone_Selected(GlobalSceneGraph(), true); Scene_Clone_Selected(GlobalSceneGraph(), true);
@ -1993,6 +1994,7 @@ GtkMenuItem* create_edit_menu()
create_menu_item_with_mnemonic(menu, "P_aste To Camera", "PasteToCamera"); create_menu_item_with_mnemonic(menu, "P_aste To Camera", "PasteToCamera");
menu_separator(menu); menu_separator(menu);
create_menu_item_with_mnemonic(menu, "_Duplicate", "CloneSelection"); create_menu_item_with_mnemonic(menu, "_Duplicate", "CloneSelection");
create_menu_item_with_mnemonic(menu, "Duplicate, make uni_que", "CloneSelectionAndMakeUnique");
create_menu_item_with_mnemonic(menu, "D_elete", "DeleteSelection"); create_menu_item_with_mnemonic(menu, "D_elete", "DeleteSelection");
menu_separator(menu); menu_separator(menu);
create_menu_item_with_mnemonic(menu, "Pa_rent", "ParentSelection"); create_menu_item_with_mnemonic(menu, "Pa_rent", "ParentSelection");
@ -3408,7 +3410,7 @@ void MainFrame_Construct()
GlobalCommands_insert("Paste", FreeCaller<Paste>(), Accelerator('V', (GdkModifierType)GDK_CONTROL_MASK)); GlobalCommands_insert("Paste", FreeCaller<Paste>(), Accelerator('V', (GdkModifierType)GDK_CONTROL_MASK));
GlobalCommands_insert("PasteToCamera", FreeCaller<PasteToCamera>(), Accelerator('V', (GdkModifierType)GDK_MOD1_MASK)); GlobalCommands_insert("PasteToCamera", FreeCaller<PasteToCamera>(), Accelerator('V', (GdkModifierType)GDK_MOD1_MASK));
GlobalCommands_insert("CloneSelection", FreeCaller<Selection_Clone>(), Accelerator(GDK_space)); GlobalCommands_insert("CloneSelection", FreeCaller<Selection_Clone>(), Accelerator(GDK_space));
GlobalCommands_insert("CloneSelectionAndFixNames", FreeCaller<Selection_Clone_FixNames>(), Accelerator(GDK_space, (GdkModifierType)GDK_SHIFT_MASK)); GlobalCommands_insert("CloneSelectionAndMakeUnique", FreeCaller<Selection_Clone_MakeUnique>(), Accelerator(GDK_space, (GdkModifierType)GDK_SHIFT_MASK));
GlobalCommands_insert("DeleteSelection", FreeCaller<deleteSelection>(), Accelerator(GDK_BackSpace)); GlobalCommands_insert("DeleteSelection", FreeCaller<deleteSelection>(), Accelerator(GDK_BackSpace));
GlobalCommands_insert("ParentSelection", FreeCaller<Scene_parentSelected>()); GlobalCommands_insert("ParentSelection", FreeCaller<Scene_parentSelected>());
GlobalCommands_insert("UnSelectSelection", FreeCaller<Selection_Deselect>(), Accelerator(GDK_Escape)); GlobalCommands_insert("UnSelectSelection", FreeCaller<Selection_Deselect>(), Accelerator(GDK_Escape));