diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-31 18:47:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-31 18:47:49 +0200 |
| commit | 1ed978574eb6623d3410b14198a5af8ad50683ed (patch) | |
| tree | a1c71a074222a5d333504a7edc85da05b8948b0b | |
| parent | 3aa32ef4b0f031b8541d00fc41b0c295fbd71f3d (diff) | |
| parent | 947d7c83294faf4da808c184c12d65d7f2382796 (diff) | |
Merge pull request #59747 from bruvzg/clang_san_fixes
| -rw-r--r-- | core/object/method_bind.h | 6 | ||||
| -rw-r--r-- | modules/gdscript/gdscript.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/object/method_bind.h b/core/object/method_bind.h index 27098571e3..bde6cba199 100644 --- a/core/object/method_bind.h +++ b/core/object/method_bind.h @@ -214,7 +214,7 @@ public: private: PropertyInfo _gen_return_type_info() const { - return reinterpret_cast<const Derived *>(this)->_gen_return_type_info_impl(); + return Derived::_gen_return_type_info_impl(); } }; @@ -237,7 +237,7 @@ public: } private: - PropertyInfo _gen_return_type_info_impl() const { + static PropertyInfo _gen_return_type_info_impl() { return {}; } }; @@ -267,7 +267,7 @@ public: } private: - PropertyInfo _gen_return_type_info_impl() const { + static PropertyInfo _gen_return_type_info_impl() { return GetTypeInfo<R>::get_class_info(); } }; diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index d415684d10..3a0e320e9b 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -824,7 +824,7 @@ Error GDScript::reload(bool p_keep_state) { // Loading a template, don't parse. #ifdef TOOLS_ENABLED - if (basedir.begins_with(EditorSettings::get_singleton()->get_project_script_templates_dir())) { + if (EditorSettings::get_singleton() && basedir.begins_with(EditorSettings::get_singleton()->get_project_script_templates_dir())) { return OK; } #endif |