summaryrefslogtreecommitdiff
path: root/scene/main
diff options
context:
space:
mode:
authorhilfazer <az13337@gmail.com>2021-02-26 19:28:09 +0100
committerhilfazer <az13337@gmail.com>2021-02-26 19:28:09 +0100
commit1810654369dab53c4544f78f537f5bc246ef0c1b (patch)
tree391220535d39a253992efdaff336557a50ab9888 /scene/main
parentcb29e6c49cde181999435c7f8284bce2d20ab7d8 (diff)
Prevent crash when clicking Mesh in MeshInstance when is scene root
Diffstat (limited to 'scene/main')
-rw-r--r--scene/main/node.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 893621fbc4..df00af8f5b 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -1976,7 +1976,7 @@ bool Node::is_editable_instance(const Node *p_node) const {
Node *Node::get_deepest_editable_node(Node *p_start_node) const {
ERR_FAIL_NULL_V(p_start_node, nullptr);
- ERR_FAIL_COND_V(!is_a_parent_of(p_start_node), nullptr);
+ ERR_FAIL_COND_V(!is_a_parent_of(p_start_node), p_start_node);
Node const *iterated_item = p_start_node;
Node *node = p_start_node;