Merge pull request #81300 from bitsawer/fix_empty_shader_handling

Fix empty shader resource loading
godotengine · Sep 5, 2023 · 3604b46 · 3604b46
2 parents cfdc016 + 15eec24
commit 3604b46
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp
@@ -239,8 +239,10 @@ Ref<Resource> ResourceFormatLoaderShader::load(const String &p_path, const Strin
 	ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot load shader: " + p_path);
 
 	String str;
-	error = str.parse_utf8((const char *)buffer.ptr(), buffer.size());
-	ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot parse shader: " + p_path);
+	if (buffer.size() > 0) {
+		error = str.parse_utf8((const char *)buffer.ptr(), buffer.size());
+		ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot parse shader: " + p_path);
+	}
 
 	Ref<Shader> shader;
 	shader.instantiate();

diff --git a/scene/resources/shader_include.cpp b/scene/resources/shader_include.cpp
@@ -93,8 +93,10 @@ Ref<Resource> ResourceFormatLoaderShaderInclude::load(const String &p_path, cons
 	ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot load shader include: " + p_path);
 
 	String str;
-	error = str.parse_utf8((const char *)buffer.ptr(), buffer.size());
-	ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot parse shader include: " + p_path);
+	if (buffer.size() > 0) {
+		error = str.parse_utf8((const char *)buffer.ptr(), buffer.size());
+		ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot parse shader include: " + p_path);
+	}
 
 	Ref<ShaderInclude> shader_inc;
 	shader_inc.instantiate();