Merge pull request #107192 from MajorMcDoom/lightmap-allow-empty-user-data

akien-mga · akien-mga · commit c535f5644b37 · 2025-06-06T17:38:03.000+02:00
Make `LightmapGIData::_set_user_data` a proper setter instead of an additive operation
diff --git a/scene/3d/lightmap_gi.cpp b/scene/3d/lightmap_gi.cpp
@@ -81,9 +81,8 @@ void LightmapGIData::clear_users() {
 }
 
 void LightmapGIData::_set_user_data(const Array &p_data) {
-	ERR_FAIL_COND(p_data.is_empty());
 	ERR_FAIL_COND((p_data.size() % 4) != 0);
-
+	users.clear();
 	for (int i = 0; i < p_data.size(); i += 4) {
 		add_user(p_data[i + 0], p_data[i + 1], p_data[i + 2], p_data[i + 3]);
 	}

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,8 @@ void LightmapGIData::clear_users() {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`void LightmapGIData::_set_user_data(const Array &p_data) {`
`84`		`- ERR_FAIL_COND(p_data.is_empty());`
`85`	`84`	`ERR_FAIL_COND((p_data.size() % 4) != 0);`
`86`		`-`
	`85`	`+ users.clear();`
`87`	`86`	`for (int i = 0; i < p_data.size(); i += 4) {`
`88`	`87`	`add_user(p_data[i + 0], p_data[i + 1], p_data[i + 2], p_data[i + 3]);`
`89`	`88`	`}`