diff options
| author | David Snopek <dsnopek@gmail.com> | 2024-06-28 07:26:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-28 07:26:44 -0500 |
| commit | 99926d8e2027f6bfdc66e341a1c735b20eda61e4 (patch) | |
| tree | 1e1b62f6a22b66dc2a6b38c442607a58885b68cd | |
| parent | 53b546e1df6c732a6a59ddf0ded5eb4249664eb8 (diff) | |
| parent | 41aa71f8c366feb7949ad30c3459ce9158c9565b (diff) | |
| download | redot-cpp-99926d8e2027f6bfdc66e341a1c735b20eda61e4.tar.gz | |
Merge pull request #1483 from AThousandShips/arr_typed_fix
Fix sharing of typed arrays from constructor
| -rw-r--r-- | include/godot_cpp/variant/typed_array.hpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/include/godot_cpp/variant/typed_array.hpp b/include/godot_cpp/variant/typed_array.hpp index 47b7410..ce20139 100644 --- a/include/godot_cpp/variant/typed_array.hpp +++ b/include/godot_cpp/variant/typed_array.hpp @@ -44,10 +44,15 @@ public: _ref(p_array); } _FORCE_INLINE_ TypedArray(const Variant &p_variant) : - Array(p_variant.operator Array(), Variant::OBJECT, T::get_class_static(), Variant()) { + TypedArray(Array(p_variant)) { } - _FORCE_INLINE_ TypedArray(const Array &p_array) : - Array(p_array, Variant::OBJECT, T::get_class_static(), Variant()) { + _FORCE_INLINE_ TypedArray(const Array &p_array) { + set_typed(Variant::OBJECT, T::get_class_static(), Variant()); + if (is_same_typed(p_array)) { + _ref(p_array); + } else { + assign(p_array); + } } _FORCE_INLINE_ TypedArray() { set_typed(Variant::OBJECT, T::get_class_static(), Variant()); @@ -65,10 +70,15 @@ public: _ref(p_array); \ } \ _FORCE_INLINE_ TypedArray(const Variant &p_variant) : \ - Array(p_variant.operator Array(), m_variant_type, StringName(), Variant()) { \ + TypedArray(Array(p_variant)) { \ } \ - _FORCE_INLINE_ TypedArray(const Array &p_array) : \ - Array(p_array, m_variant_type, StringName(), Variant()) { \ + _FORCE_INLINE_ TypedArray(const Array &p_array) { \ + set_typed(m_variant_type, StringName(), Variant()); \ + if (is_same_typed(p_array)) { \ + _ref(p_array); \ + } else { \ + assign(p_array); \ + } \ } \ _FORCE_INLINE_ TypedArray() { \ set_typed(m_variant_type, StringName(), Variant()); \ |