diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-28 11:02:43 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-28 11:02:43 +0100 |
| commit | c3920936681b68dc42e259a206dac726fd240d10 (patch) | |
| tree | 43bf1e9d128ec8cbf2a213cae39499a50680aed6 /editor/editor_data.cpp | |
| parent | be0923b1d98cec6605baca0be8c9bf65c1ed996f (diff) | |
| parent | 847c9bd24832d51b1bbf763d445d2d57806486fe (diff) | |
Merge pull request #69272 from rune-scape/rune-avoid-global-base
Avoid using `get_global_class_native_base`
Diffstat (limited to 'editor/editor_data.cpp')
| -rw-r--r-- | editor/editor_data.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index 48be0c9c00..f15b874c45 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -945,11 +945,11 @@ StringName EditorData::script_class_get_base(const String &p_class) const { Variant EditorData::script_class_instance(const String &p_class) { if (ScriptServer::is_global_class(p_class)) { - Variant obj = ClassDB::instantiate(ScriptServer::get_global_class_native_base(p_class)); - if (obj) { - Ref<Script> script = script_class_load_script(p_class); - if (script.is_valid()) { - ((Object *)obj)->set_script(script); + Ref<Script> script = script_class_load_script(p_class); + if (script.is_valid()) { + Object *obj = ClassDB::instantiate(script->get_instance_base_type()); + if (obj) { + obj->set_script(script); } return obj; } |