Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Stop asuming a default value of NIL means there's no default

Browse source 
(cherry picked from commit 18663aa305)
This commit is contained in:
Pedro J. Estébanez 2021-12-11 14:03:48 +01:00 • committed by Rémi Verschelde
parent a074b66380
commit 4f38a9e4d6
No known key found for this signature in database
GPG key ID: C3336907360768E1
6 changed files with 32 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scene/property_utils.cpp
View file

@ -48,7 +48,7 @@ bool PropertyUtils::is_property_value_different(const Variant &p_a, const Varian
}
}
Variant PropertyUtils::get_property_default_value(const Object *p_object, const StringName &p_property, const Vector<SceneState::PackState> *p_states_stack_cache, bool p_update_exports, const Node *p_owner, bool *r_is_class_default) {
Variant PropertyUtils::get_property_default_value(const Object *p_object, const StringName &p_property, bool *r_is_valid, const Vector<SceneState::PackState> *p_states_stack_cache, bool p_update_exports, const Node *p_owner, bool *r_is_class_default) {
// This function obeys the way property values are set when an object is instantiated,
// which is the following (the latter wins):
// 1. Default value from builtin class
@ -58,6 +58,9 @@ Variant PropertyUtils::get_property_default_value(const Object *p_object, const
if (r_is_class_default) {
*r_is_class_default = false;
}
if (r_is_valid) {
*r_is_valid = false;
}
Ref<Script> topmost_script;
@ -69,6 +72,9 @@ Variant PropertyUtils::get_property_default_value(const Object *p_object, const
bool found = false;
Variant value_in_ancestor = ia.state->get_property_value(ia.node, p_property, found);
if (found) {
if (r_is_valid) {
*r_is_valid = true;
}
return value_in_ancestor;
}
// Save script for later
@ -95,6 +101,9 @@ Variant PropertyUtils::get_property_default_value(const Object *p_object, const
topmost_script->update_exports();
}
if (topmost_script->get_property_default_value(p_property, default_value)) {
if (r_is_valid) {
*r_is_valid = true;
}
return default_value;
}
}
@ -103,7 +112,7 @@ Variant PropertyUtils::get_property_default_value(const Object *p_object, const
if (r_is_class_default) {
*r_is_class_default = true;
}
return ClassDB::class_get_default_property_value(p_object->get_class_name(), p_property);
return ClassDB::class_get_default_property_value(p_object->get_class_name(), p_property, r_is_valid);
}
// Like SceneState::PackState, but using a raw pointer to avoid the cost of