maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #50056 from Blackiris/fix-in-operator

Browse source 
Fix 'in' operator to check if an object member exists
This commit is contained in:
George Marques 2021-07-13 14:25:42 -03:00 committed by GitHub
parent e2a2138d2b 0a823e85d2
commit 7bc52e56c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/variant/variant_op.h
View file

@ -1261,8 +1261,10 @@ public:
const String &a = *VariantGetInternalPtr<String>::get_ptr(&p_left);
b->get(a, &r_valid);
*r_ret = r_valid;
bool exist;
b->get(a, &exist);
*r_ret = exist;
r_valid = true;
}
static inline void validated_evaluate(const Variant *left, const Variant *right, Variant *r_ret) {
Object *l = right->get_validated_object();
@ -1293,8 +1295,10 @@ public:
const StringName &a = *VariantGetInternalPtr<StringName>::get_ptr(&p_left);
b->get(a, &r_valid);
*r_ret = r_valid;
bool exist;
b->get(a, &exist);
*r_ret = exist;
r_valid = true;
}
static inline void validated_evaluate(const Variant *left, const Variant *right, Variant *r_ret) {
Object *l = right->get_validated_object();