aboutsummaryrefslogtreecommitdiff
path: root/editor/animation_editor.cpp
diff options
context:
space:
mode:
authorRémi Verschelde2017-08-25 08:37:38 +0200
committerGitHub2017-08-25 08:37:38 +0200
commit490aef93699abc00da58f73b1596fb3473fd53c6 (patch)
tree7912c7a540eca6b09392bbd2aa2f30fefe37f51a /editor/animation_editor.cpp
parentb1c0e45b03aa14453846c9a888763077eef2476b (diff)
parentcacced7e507f7603bacc03ae2616e58f0ede122a (diff)
downloadgodot-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/animation_editor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/animation_editor.cpp b/editor/animation_editor.cpp
index ed80be9e1..55542a59a 100644
--- a/editor/animation_editor.cpp
+++ b/editor/animation_editor.cpp
@@ -3249,9 +3249,9 @@ void AnimationKeyEditor::insert_value_key(const String &p_property, const Varian
//let's build a node path
ERR_FAIL_COND(history->get_path_size() == 0);
Object *obj = ObjectDB::get_instance(history->get_path_object(0));
- ERR_FAIL_COND(!obj || !obj->cast_to<Node>());
+ ERR_FAIL_COND(!Object::cast_to<Node>(obj));
- Node *node = obj->cast_to<Node>();
+ Node *node = Object::cast_to<Node>(obj);
String path = root->get_path_to(node);