diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-08-27 22:28:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-27 22:28:40 +0200 |
| commit | f3b2c217c640071b6874101f819a857dabb80e20 (patch) | |
| tree | 6b35745ba6cbbc5f5d6c60e7e51738383d8c02f7 /tools/editor | |
| parent | c29c70275e127e178c06b4c01f65acac124ba7ca (diff) | |
| parent | 4857eabddb3eda7fef9ee3740a0325265209c640 (diff) | |
Merge pull request #6259 from volzhs/issue-6244
Prevent to add node to selection when node is not inside tree
Diffstat (limited to 'tools/editor')
| -rw-r--r-- | tools/editor/editor_data.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/editor_data.cpp b/tools/editor/editor_data.cpp index 8d3fd6c9c2..35ec1ebfcc 100644 --- a/tools/editor/editor_data.cpp +++ b/tools/editor/editor_data.cpp @@ -834,7 +834,7 @@ void EditorSelection::_node_removed(Node *p_node) { void EditorSelection::add_node(Node *p_node) { ERR_FAIL_NULL(p_node); - + ERR_FAIL_COND(!p_node->is_inside_tree()); if (selection.has(p_node)) return; |