diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-11 13:53:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-11 13:53:27 +0100 |
| commit | f6be114d02499d857c4b546df1870acfd15b136a (patch) | |
| tree | 6bd93d4f0e09e0822277c2b6d2c0b34ad1e59f7d /core/variant | |
| parent | 3e9a40cdc0c2fe70c3278f0208e4798a226ee70f (diff) | |
| parent | bb4d44102deaf8f282a25b409c290ea6d64aed57 (diff) | |
Merge pull request #44427 from briansemrau/fix-variant-bitand-validated-eval
Fix bitwise-and eval not updating return type
Diffstat (limited to 'core/variant')
| -rw-r--r-- | core/variant/variant_op.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/variant/variant_op.cpp b/core/variant/variant_op.cpp index e9c817bc9f..e0a3cf4215 100644 --- a/core/variant/variant_op.cpp +++ b/core/variant/variant_op.cpp @@ -318,6 +318,7 @@ public: r_valid = true; } static void validated_evaluate(const Variant *left, const Variant *right, Variant *r_ret) { + VariantTypeChanger<R>::change(r_ret); *VariantGetInternalPtr<R>::get_ptr(r_ret) = *VariantGetInternalPtr<A>::get_ptr(left) & *VariantGetInternalPtr<B>::get_ptr(right); } static void ptr_evaluate(const void *left, const void *right, void *r_ret) { |