godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31237 from KoBeWi/transformnodes 

Improve node Change Type option
This commit is contained in:
Rémi Verschelde 2019-08-09 19:22:02 +02:00 committed by GitHub
parent aaa55dfac1 9fbba73dd5
commit 71a6d2cd17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/scene_tree_dock.cpp
View File

@ -399,6 +399,9 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
} }
Node *selected = scene_tree->get_selected(); Node *selected = scene_tree->get_selected();
if (!selected && !editor_selection->get_selected_node_list().empty())
selected = editor_selection->get_selected_node_list().front()->get();
if (selected) if (selected)
create_dialog->popup_create(false, true, selected->get_class()); create_dialog->popup_create(false, true, selected->get_class());
@ -1983,6 +1986,10 @@ void SceneTreeDock::_create() {
} else if (current_option == TOOL_REPLACE) { } else if (current_option == TOOL_REPLACE) {
List<Node *> selection = editor_selection->get_selected_node_list(); List<Node *> selection = editor_selection->get_selected_node_list();
ERR_FAIL_COND(selection.size() <= 0); ERR_FAIL_COND(selection.size() <= 0);
UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
ur->create_action(TTR("Change type of node(s)"));
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
Node *n = E->get(); Node *n = E->get();
ERR_FAIL_COND(!n); ERR_FAIL_COND(!n);
@ -1993,8 +2000,13 @@ void SceneTreeDock::_create() {
Node *newnode = Object::cast_to<Node>(c); Node *newnode = Object::cast_to<Node>(c);
ERR_FAIL_COND(!newnode); ERR_FAIL_COND(!newnode);
replace_node(n, newnode); ur->add_do_method(this, "replace_node", n, newnode, true, false);
ur->add_do_reference(newnode);
ur->add_undo_method(this, "replace_node", newnode, n, false, false);
ur->add_undo_reference(n);
} }
ur->commit_action();
} else if (current_option == TOOL_REPARENT_TO_NEW_NODE) { } else if (current_option == TOOL_REPARENT_TO_NEW_NODE) {
List<Node *> selection = editor_selection->get_selected_node_list(); List<Node *> selection = editor_selection->get_selected_node_list();
ERR_FAIL_COND(selection.size() <= 0); ERR_FAIL_COND(selection.size() <= 0);