asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix too broad assumption of null property defaults

Browse source 
(cherry picked from commit 7a66af274a)
This commit is contained in:
Pedro J. Estébanez 2022-01-06 21:46:59 +01:00 committed by Rémi Verschelde
parent 5d9117d4bd
commit 0b6b2015f0
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
scene/property_utils.cpp
View file

@ -109,15 +109,37 @@ Variant PropertyUtils::get_property_default_value(const Object *p_object, const
} }
// Fall back to the default from the native class // Fall back to the default from the native class
if (r_is_class_default) { {
*r_is_class_default = true; if (r_is_class_default) {
*r_is_class_default = true;
}
bool valid = false;
Variant value = ClassDB::class_get_default_property_value(p_object->get_class_name(), p_property, &valid);
if (valid) {
if (r_is_valid) {
*r_is_valid = true;
}
return value;
} else {
// Heuristically check if this is a synthetic property (whatever/0, whatever/1, etc.)
// because they are not in the class DB yet must have a default (null).
String prop_str = String(p_property);
int p = prop_str.rfind("/");
if (p != -1 && p < prop_str.length() - 1) {
bool all_digits = true;
for (int i = p + 1; i < prop_str.length(); i++) {
if (prop_str[i] < '0' || prop_str[i] > '9') {
all_digits = false;
break;
}
}
if (r_is_valid) {
*r_is_valid = all_digits;
}
}
return Variant();
}
} }
// This is saying that properties not registered in the class DB are considered to have a default value of null
// (that covers cases like synthetic properties in the style of whatever/0, whatever/1, which may not have a value in any ancestor).
if (r_is_valid) {
*r_is_valid = true;
}
return ClassDB::class_get_default_property_value(p_object->get_class_name(), p_property);
} }
// Like SceneState::PackState, but using a raw pointer to avoid the cost of // Like SceneState::PackState, but using a raw pointer to avoid the cost of