summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-08-16 15:40:04 +0200
committerRémi Verschelde <rverschelde@gmail.com>2018-08-16 15:40:06 +0200
commitba47f15b786de8b6e1ea8a6bb8227e401180966e (patch)
tree485b91e8339dcba308d5ce77372974f0bf692ffe
parentbe9e349f563ec716cf3740850dc7aec20aed97c0 (diff)
Fix crash assigning script to a Resource
We were dereferencing the wrong identifier, which could be NULL. Fixes #19289, supersedes and closes #20985.
-rw-r--r--editor/editor_properties.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index 59798bfab3..0cbd5f0bff 100644
--- a/editor/editor_properties.cpp
+++ b/editor/editor_properties.cpp
@@ -2052,7 +2052,7 @@ void EditorPropertyResource::_menu_option(int p_which) {
ERR_BREAK(!resp);
if (get_edited_object() && base_type != String() && base_type == "Script") {
//make visual script the right type
- res->call("set_instance_base_type", get_edited_object()->get_class());
+ resp->call("set_instance_base_type", get_edited_object()->get_class());
}
res = Ref<Resource>(resp);