aboutsummaryrefslogtreecommitdiff
path: root/core/variant.cpp
diff options
context:
space:
mode:
authorHein-Pieter van Braam2017-08-24 22:58:51 +0200
committerHein-Pieter van Braam2017-08-24 23:08:24 +0200
commitcacced7e507f7603bacc03ae2616e58f0ede122a (patch)
tree7af89373e86cd1a7af6ea04e10280084cabb7144 /core/variant.cpp
parent4aa2c18cb428ffde05c67987926736a9ca62703b (diff)
downloadgodot-cacced7e507f7603bacc03ae2616e58f0ede122a.tar.gz
godot-cacced7e507f7603bacc03ae2616e58f0ede122a.tar.zst
godot-cacced7e507f7603bacc03ae2616e58f0ede122a.zip
Diffstat (limited to 'core/variant.cpp')
-rw-r--r--core/variant.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/variant.cpp b/core/variant.cpp
index 51c4b70bd..e6a69edd0 100644
--- a/core/variant.cpp
+++ b/core/variant.cpp
@@ -1764,14 +1764,14 @@ Variant::operator Object *() const {
Variant::operator Node *() const {
if (type == OBJECT)
- return _get_obj().obj ? _get_obj().obj->cast_to<Node>() : NULL;
+ return Object::cast_to<Node>(_get_obj().obj);
else
return NULL;
}
Variant::operator Control *() const {
if (type == OBJECT)
- return _get_obj().obj ? _get_obj().obj->cast_to<Control>() : NULL;
+ return Object::cast_to<Control>(_get_obj().obj);
else
return NULL;
}