Merge pull request #19263 from vnen/fix-get-return

Fix return type of _get() virtual method
2018-05-31 18:47:55 +02:00 · 2018-05-31 18:47:55 +02:00 · 255d6470ee
parent 44b0146953 34e2ccc593
commit 255d6470ee
1 changed files with 1 additions and 0 deletions
--- a/core/object.cpp
+++ b/core/object.cpp
@ -1677,6 +1677,7 @@ void Object::_bind_methods() {
 #ifdef TOOLS_ENABLED
 	MethodInfo miget("_get", PropertyInfo(Variant::STRING, "property"));
 	miget.return_val.name = "Variant";
+	miget.return_val.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
 	BIND_VMETHOD(miget);

 	MethodInfo plget("_get_property_list");