summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorMatthias Hoelzl <tc@xantira.com>2017-12-14 17:49:02 +0100
committerMatthias Hoelzl <tc@xantira.com>2017-12-14 17:49:02 +0100
commitce24b149d3c0c1088b9e2921d4da474ba6ba1091 (patch)
treeb5efd5a4be42bb3845121588b38922d65ae01e48 /editor
parentb872439eefb7d54a572ace3a57fea01787c46952 (diff)
Prevent users from moving instanced children
Diffstat (limited to 'editor')
-rw-r--r--editor/scene_tree_editor.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp
index 25924212fd..2bb714ac7d 100644
--- a/editor/scene_tree_editor.cpp
+++ b/editor/scene_tree_editor.cpp
@@ -774,9 +774,11 @@ Variant SceneTreeEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from
Node *n = get_node(np);
if (n) {
-
- selected.push_back(n);
- icons.push_back(next->get_icon(0));
+ // Only allow selection if not part of an instanced scene.
+ if (!n->get_owner() || n->get_owner() == get_scene_node() || n->get_owner()->get_filename() == String()) {
+ selected.push_back(n);
+ icons.push_back(next->get_icon(0));
+ }
}
next = tree->get_next_selected(next);
}