godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 19:11:41 +00:00
Code 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
1 changed files with 8 additions and 4 deletions
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();