diff options
| author | punto- <ariel@godotengine.org> | 2016-06-06 23:40:50 -0300 |
|---|---|---|
| committer | punto- <ariel@godotengine.org> | 2016-06-06 23:40:50 -0300 |
| commit | 86253cbdfe0410ad4d50c2051036b51fb01ea16d (patch) | |
| tree | e5734f78f02470a4afe0f8edb02931409f0f41a9 /modules/gdscript/gd_script.cpp | |
| parent | 0c985913a74ce196e81e711350961f3bd97a7355 (diff) | |
Revert "Fix implicit GDScript Reference inheritance"
Diffstat (limited to 'modules/gdscript/gd_script.cpp')
| -rw-r--r-- | modules/gdscript/gd_script.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index 12fc36d8c1..dcd0641f76 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -145,8 +145,11 @@ Variant GDScript::_new(const Variant** p_args,int p_argcount,Variant::CallError& _baseptr=_baseptr->_base; } - ERR_FAIL_COND_V(_baseptr->native.is_null(), Variant()); - owner=_baseptr->native->instance(); + if (_baseptr->native.ptr()) { + owner=_baseptr->native->instance(); + } else { + owner=memnew( Reference ); //by default, no base means use reference + } Reference *r=owner->cast_to<Reference>(); if (r) { |