diff options
| author | Juan Linietsky | 2016-06-06 21:15:13 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-06-06 21:15:13 -0300 |
| commit | e535c942f3c1b7e87a2971101192df5c259cdd30 (patch) | |
| tree | ae1066a4cf8ff4e2fdc23a356e5e1894fbe4ebab /modules/gdscript/gd_compiler.cpp | |
| parent | 2b9cab25c08f9319fcb9d89262d8eda5618a89ee (diff) | |
| parent | c86f1f1737ee58dca9ad6c4ddb3b475fc005453a (diff) | |
| download | godot-e535c942f3c1b7e87a2971101192df5c259cdd30.tar.gz godot-e535c942f3c1b7e87a2971101192df5c259cdd30.tar.zst godot-e535c942f3c1b7e87a2971101192df5c259cdd30.zip | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'modules/gdscript/gd_compiler.cpp')
| -rw-r--r-- | modules/gdscript/gd_compiler.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/gdscript/gd_compiler.cpp b/modules/gdscript/gd_compiler.cpp index d51f1a4dd..072c53fb9 100644 --- a/modules/gdscript/gd_compiler.cpp +++ b/modules/gdscript/gd_compiler.cpp @@ -1588,6 +1588,12 @@ Error GDCompiler::_parse_class(GDScript *p_script, GDScript *p_owner, const GDPa } + } else { + // without extends, implicitly extend Reference + int native_idx = GDScriptLanguage::get_singleton()->get_global_map()["Reference"]; + native = GDScriptLanguage::get_singleton()->get_global_array()[native_idx]; + ERR_FAIL_COND_V(native.is_null(), ERR_BUG); + p_script->native=native; } |