diff --git a/binding_generator.py b/binding_generator.py index 2a647255..5e1b4beb 100644 --- a/binding_generator.py +++ b/binding_generator.py @@ -1179,6 +1179,12 @@ def generate_engine_classes_bindings(api, output_dir, use_template_get_node): else: fully_used_classes.add("Wrapped") + # In order to ensure that PtrToArg specializations for native structs are + # always used, let's move any of them into 'fully_used_classes'. + for type_name in used_classes: + if is_struct_type(type_name) and not is_included_struct_type(type_name): + fully_used_classes.add(type_name) + for type_name in fully_used_classes: if type_name in used_classes: used_classes.remove(type_name) diff --git a/include/godot_cpp/core/method_ptrcall.hpp b/include/godot_cpp/core/method_ptrcall.hpp index a85cbc94..32f3f459 100644 --- a/include/godot_cpp/core/method_ptrcall.hpp +++ b/include/godot_cpp/core/method_ptrcall.hpp @@ -168,6 +168,7 @@ MAKE_PTRARG_BY_REFERENCE(Variant); template struct PtrToArg { + static_assert(std::is_base_of::value, "Cannot encode non-Object value as an Object"); _FORCE_INLINE_ static T *convert(const void *p_ptr) { return reinterpret_cast(godot::internal::get_object_instance_binding(*reinterpret_cast(const_cast(p_ptr)))); } @@ -179,6 +180,7 @@ struct PtrToArg { template struct PtrToArg { + static_assert(std::is_base_of::value, "Cannot encode non-Object value as an Object"); _FORCE_INLINE_ static const T *convert(const void *p_ptr) { return reinterpret_cast(godot::internal::get_object_instance_binding(*reinterpret_cast(const_cast(p_ptr)))); }