diff options
| -rw-r--r-- | core/object/method_bind.h | 6 | ||||
| -rw-r--r-- | modules/gdscript/gdscript.cpp | 2 | ||||
| -rw-r--r-- | scene/2d/collision_object_2d.cpp | 2 |
3 files changed, 5 insertions, 5 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 diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp index 50863f2c4d..c503de2d59 100644 --- a/scene/2d/collision_object_2d.cpp +++ b/scene/2d/collision_object_2d.cpp @@ -81,7 +81,7 @@ void CollisionObject2D::_notification(int p_what) { return; } - Transform2D global_transform = get_global_transform(); + Transform2D global_transform = get_global_transform_with_canvas(); if (area) { PhysicsServer2D::get_singleton()->area_set_transform(rid, global_transform); |