Merge pull request #108558 from KoBeWi/variant_of_the_lost

Repiteo · Repiteo · commit 7f110a6c3e51 · 2025-07-15T16:58:35.000-05:00
Fix Variant properties losing value upon script update
diff --git a/core/object/script_language.cpp b/core/object/script_language.cpp
@@ -795,7 +795,7 @@ void PlaceHolderScriptInstance::update(const List<PropertyInfo> &p_properties, c
 		StringName n = E.name;
 		new_values.insert(n);
 
-		if (!values.has(n) || values[n].get_type() != E.type) {
+		if (!values.has(n) || (E.type != Variant::NIL && values[n].get_type() != E.type)) {
 			if (p_values.has(n)) {
 				values[n] = p_values[n];
 			}

Original file line number	Diff line number	Diff line change
`@@ -795,7 +795,7 @@ void PlaceHolderScriptInstance::update(const List<PropertyInfo> &p_properties, c`
`795`	`795`	`StringName n = E.name;`
`796`	`796`	`new_values.insert(n);`
`797`	`797`
`798`		`- if (!values.has(n) \|\| values[n].get_type() != E.type) {`
	`798`	`+ if (!values.has(n) \|\| (E.type != Variant::NIL && values[n].get_type() != E.type)) {`
`799`	`799`	`if (p_values.has(n)) {`
`800`	`800`	`values[n] = p_values[n];`
`801`	`801`	`}`