Merge pull request #85486 from paulloz/fix/property-groups-shadowing

Fix property groups overriding real properties
godotengine · Dec 5, 2023 · 75d7aab · 75d7aab
2 parents 36e033b + decf3b2
commit 75d7aab
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/core/object/script_language.cpp b/core/object/script_language.cpp
@@ -631,6 +631,10 @@ bool PlaceHolderScriptInstance::has_method(const StringName &p_method) const {
 void PlaceHolderScriptInstance::update(const List<PropertyInfo> &p_properties, const HashMap<StringName, Variant> &p_values) {
 	HashSet<StringName> new_values;
 	for (const PropertyInfo &E : p_properties) {
+		if (E.usage & (PROPERTY_USAGE_GROUP | PROPERTY_USAGE_SUBGROUP | PROPERTY_USAGE_CATEGORY)) {
+			continue;
+		}
+
 		StringName n = E.name;
 		new_values.insert(n);