Merge pull request #83780 from jsjtxietian/prevent-null-variant-crash

Prevent `_allocate_placeholders` crash if `p_version->variants` is null
godotengine · Oct 23, 2023 · 17aa5c5 · 17aa5c5
2 parents 8f16d5f + 5f85a04
commit 17aa5c5
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/servers/rendering/renderer_rd/shader_rd.cpp b/servers/rendering/renderer_rd/shader_rd.cpp
@@ -480,6 +480,7 @@ void ShaderRD::_save_to_cache(Version *p_version, int p_group) {
 }
 
 void ShaderRD::_allocate_placeholders(Version *p_version, int p_group) {
+	ERR_FAIL_NULL(p_version->variants);
 	for (uint32_t i = 0; i < group_to_variant_map[p_group].size(); i++) {
 		int variant_id = group_to_variant_map[p_group][i];
 		RID shader = RD::get_singleton()->shader_create_placeholder();