godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #14652 from hoelzl/pr-moved-instanced-children

Browse Source 
Prevent users from moving instanced children
This commit is contained in:
Rémi Verschelde
2017-12-16 00:38:52 +01:00
committed by GitHub
parent dcdf9008ae ce24b149d3
commit f73f10dd7e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/scene_tree_editor.cpp
View File

@@ -774,9 +774,11 @@ Variant SceneTreeEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from
Node *n = get_node(np); Node *n = get_node(np);
if (n) { if (n) {
// Only allow selection if not part of an instanced scene.
selected.push_back(n); if (!n->get_owner() || n->get_owner() == get_scene_node() || n->get_owner()->get_filename() == String()) {
icons.push_back(next->get_icon(0)); selected.push_back(n);
icons.push_back(next->get_icon(0));
}
} }
next = tree->get_next_selected(next); next = tree->get_next_selected(next);
} }