diff options
| author | Juan Linietsky | 2016-06-06 20:08:39 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-06-06 20:08:39 -0300 |
| commit | 5aa40704388be838c4fecc9989dd69bc6b5d9077 (patch) | |
| tree | 6bb83dd8a8ea585ae16ffe0068a37ec8eaa0a3f4 /modules/gdscript/gd_script.cpp | |
| parent | 9df4c1885362103baef02f01bf2012d8aa64e0a0 (diff) | |
| parent | 3acbf8e71f15c682bcf4fee248f58180e689df1c (diff) | |
| download | godot-5aa40704388be838c4fecc9989dd69bc6b5d9077.tar.gz godot-5aa40704388be838c4fecc9989dd69bc6b5d9077.tar.zst godot-5aa40704388be838c4fecc9989dd69bc6b5d9077.zip | |
Merge pull request #5054 from eska014/fix-implicit-extends
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, 2 insertions, 5 deletions
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index dcd0641f7..12fc36d8c 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -145,11 +145,8 @@ Variant GDScript::_new(const Variant** p_args,int p_argcount,Variant::CallError& _baseptr=_baseptr->_base; } - if (_baseptr->native.ptr()) { - owner=_baseptr->native->instance(); - } else { - owner=memnew( Reference ); //by default, no base means use reference - } + ERR_FAIL_COND_V(_baseptr->native.is_null(), Variant()); + owner=_baseptr->native->instance(); Reference *r=owner->cast_to<Reference>(); if (r) { |