diff options
| author | Rémi Verschelde | 2017-08-25 08:37:38 +0200 |
|---|---|---|
| committer | GitHub | 2017-08-25 08:37:38 +0200 |
| commit | 490aef93699abc00da58f73b1596fb3473fd53c6 (patch) | |
| tree | 7912c7a540eca6b09392bbd2aa2f30fefe37f51a /editor/property_selector.cpp | |
| parent | b1c0e45b03aa14453846c9a888763077eef2476b (diff) | |
| parent | cacced7e507f7603bacc03ae2616e58f0ede122a (diff) | |
| download | godot-490aef93699abc00da58f73b1596fb3473fd53c6.tar.gz godot-490aef93699abc00da58f73b1596fb3473fd53c6.tar.zst godot-490aef93699abc00da58f73b1596fb3473fd53c6.zip | |
Merge pull request #10581 from hpvb/fix-gcc6+
Make cast_to a static member of Object.
Diffstat (limited to '')
| -rw-r--r-- | editor/property_selector.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp index bd68eac9f..4b7d54a73 100644 --- a/editor/property_selector.cpp +++ b/editor/property_selector.cpp @@ -98,10 +98,10 @@ void PropertySelector::_update_search() { } else { Object *obj = ObjectDB::get_instance(script); - if (obj && obj->cast_to<Script>()) { + if (Object::cast_to<Script>(obj)) { props.push_back(PropertyInfo(Variant::NIL, "Script Variables", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_CATEGORY)); - obj->cast_to<Script>()->get_script_property_list(&props); + Object::cast_to<Script>(obj)->get_script_property_list(&props); } StringName base = base_type; @@ -200,10 +200,10 @@ void PropertySelector::_update_search() { } else { Object *obj = ObjectDB::get_instance(script); - if (obj && obj->cast_to<Script>()) { + if (Object::cast_to<Script>(obj)) { methods.push_back(MethodInfo("*Script Methods")); - obj->cast_to<Script>()->get_script_method_list(&methods); + Object::cast_to<Script>(obj)->get_script_method_list(&methods); } StringName base = base_type; |