godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build error caused by cherry-pick from 3.0

Browse Source 
Problematic commit: 5e4f092ac
This commit is contained in:
George Marques 2017-11-17 20:54:35 -02:00
parent 52da15b6fc
commit fa000c6327
No known key found for this signature in database
GPG Key ID: 046BD46A3201E43D
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editor_plugin.cpp
View File

@ -176,8 +176,9 @@ void EditorPlugin::make_visible(bool p_visible) {
void EditorPlugin::edit(Object *p_object) {
if (get_script_instance() && get_script_instance()->has_method("edit")) {
if (p_object->is_class("Resource")) {
get_script_instance()->call("edit", Ref<Resource>(Object::cast_to<Resource>(p_object)));
Resource *obj = p_object ? p_object->cast_to<Resource>() : NULL;
if (obj) {
get_script_instance()->call("edit", Ref<Resource>(obj));
} else {
get_script_instance()->call("edit", p_object);
}