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

Fix Object::get_indexed for simple properties.

Browse source 
Object::get_indexed was not correctly reporting invalid keys if the name
was a direct property (not a subproperty), causing for example Tween to
not report correctly a bad interpolate_property key.

(cherry picked from commit d39ffc101b)
This commit is contained in:
Fabio Alessandrelli 2019-05-16 23:22:52 +02:00 committed by Rémi Verschelde
parent 8ee5dc5850
commit 390dbbbcbd
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/object.cpp
View file

@ -608,18 +608,16 @@ Variant Object::get_indexed(const Vector<StringName> &p_names, bool *r_valid) co
}
bool valid = false;
Variant current_value = get(p_names[0]);
Variant current_value = get(p_names[0], &valid);
for (int i = 1; i < p_names.size(); i++) {
current_value = current_value.get_named(p_names[i], &valid);
if (!valid) {
if (r_valid)
*r_valid = false;
return Variant();
}
if (!valid)
break;
}
if (r_valid)
*r_valid = true;
*r_valid = valid;
return current_value;
}