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/array_property_edit.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/array_property_edit.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/editor/array_property_edit.cpp b/editor/array_property_edit.cpp index 06d7d5fdc..7ef24cf62 100644 --- a/editor/array_property_edit.cpp +++ b/editor/array_property_edit.cpp @@ -273,11 +273,7 @@ void ArrayPropertyEdit::edit(Object *p_obj, const StringName &p_prop, const Stri Node *ArrayPropertyEdit::get_node() { - Object *o = ObjectDB::get_instance(obj); - if (!o) - return NULL; - - return o->cast_to<Node>(); + return Object::cast_to<Node>(ObjectDB::get_instance(obj)); } void ArrayPropertyEdit::_bind_methods() { |