diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-31 18:47:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-31 18:47:55 +0200 |
| commit | 255d6470eec957b2d5010bd494f357aff1f7e8c6 (patch) | |
| tree | e1ae649a5e4adb0308d3d4715058f0fe265f195a | |
| parent | 44b0146953e3cf1b7af3449912ef1747161abc01 (diff) | |
| parent | 34e2ccc593f6b2161c8c2e84cd0f808e5de9ddc2 (diff) | |
Merge pull request #19263 from vnen/fix-get-return
Fix return type of _get() virtual method
| -rw-r--r-- | core/object.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/object.cpp b/core/object.cpp index 239700a4ab..1d2aeb7ba5 100644 --- 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"); |