summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-10-09 12:47:23 +0200
committerGitHub <noreply@github.com>2017-10-09 12:47:23 +0200
commitcb4830ef5ef6afc8cb0fd590263a43b9980db530 (patch)
treed1a88b046e882113b81f7c4eb1b2fafc81c6f385
parentd98947974439b1ef28df11972be053b9591ec55a (diff)
parentdfb6602da065f8789ef0d9212af4636c9e09997c (diff)
Merge pull request #11887 from Hinsbart/vs_crash_get_node
VisualScript: Fix crash with get_node(). [ci skip]
-rw-r--r--editor/property_editor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp
index 47ebf49c43..658f67d6a4 100644
--- a/editor/property_editor.cpp
+++ b/editor/property_editor.cpp
@@ -861,7 +861,7 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant::
names.push_back(TTR("Assign"));
names.push_back(TTR("Clear"));
- if (owner->is_class("Node") && (v.get_type() == Variant::NODE_PATH) && Object::cast_to<Node>(owner)->has_node(v))
+ if (owner && owner->is_class("Node") && (v.get_type() == Variant::NODE_PATH) && Object::cast_to<Node>(owner)->has_node(v))
names.push_back(TTR("Select Node"));
config_action_buttons(names);