godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44427 from briansemrau/fix-variant-bitand-validated-eval 

Fix bitwise-and eval not updating return type
This commit is contained in:
Rémi Verschelde 2021-01-11 13:53:27 +01:00 committed by GitHub
parent 3e9a40cdc0 bb4d44102d
commit f6be114d02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/variant/variant_op.cpp
View File

@ -318,6 +318,7 @@ public:
r_valid = true; r_valid = true;
} }
static void validated_evaluate(const Variant *left, const Variant *right, Variant *r_ret) { 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); *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) { static void ptr_evaluate(const void *left, const void *right, void *r_ret) {