summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-03-05 21:50:57 +0100
committerGitHub <noreply@github.com>2019-03-05 21:50:57 +0100
commita11d8954db07485e5a1fb6f965ed8ede3e4c0040 (patch)
tree9873bafc76d5aecd86ba1170e5e4093dfba31db3
parentc40877bc6ac81ecf0b8dc70ad1c708ac1b2bf167 (diff)
parent63a2475f0fa5ad13e86d61feca33bc3e6c9ef108 (diff)
Merge pull request #26643 from KoBeWi/readd_script_with_no_reselect
Fix attaching script after removing one
-rw-r--r--editor/scene_tree_dock.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index d931d5bb37..084830ed7b 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -336,9 +336,13 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
} break;
case TOOL_ATTACH_SCRIPT: {
+ List<Node *> selection = editor_selection->get_selected_node_list();
+ if (selection.empty())
+ break;
+
Node *selected = scene_tree->get_selected();
if (!selected)
- break;
+ selected = selection.front()->get();
Ref<Script> existing = selected->get_script();