summaryrefslogtreecommitdiffstats
path: root/servers/rendering/renderer_rd/storage_rd
diff options
context:
space:
mode:
authorbitsawer <sawerduster@gmail.com>2023-08-15 14:03:37 +0300
committerbitsawer <sawerduster@gmail.com>2023-08-15 14:18:26 +0300
commit41def3740acb57c163b803414466c9df9bf3d75e (patch)
tree0369aa2a742ed2dc3227d4d468a73034809b69a9 /servers/rendering/renderer_rd/storage_rd
parentc495eb5102278a110c14bbffbf833ed436d1594d (diff)
downloadredot-engine-41def3740acb57c163b803414466c9df9bf3d75e.tar.gz
Fix global shader uniform texture loading
Diffstat (limited to 'servers/rendering/renderer_rd/storage_rd')
-rw-r--r--servers/rendering/renderer_rd/storage_rd/material_storage.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/servers/rendering/renderer_rd/storage_rd/material_storage.cpp b/servers/rendering/renderer_rd/storage_rd/material_storage.cpp
index a96893570e..fda341bbc9 100644
--- a/servers/rendering/renderer_rd/storage_rd/material_storage.cpp
+++ b/servers/rendering/renderer_rd/storage_rd/material_storage.cpp
@@ -1821,14 +1821,16 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture
if (gvtype >= RS::GLOBAL_VAR_TYPE_SAMPLER2D) {
//textire
if (!p_load_textures) {
- value = RID();
continue;
}
String path = value;
- Ref<Resource> resource = ResourceLoader::load(path);
- ERR_CONTINUE(resource.is_null());
- value = resource;
+ if (path.is_empty()) {
+ value = RID();
+ } else {
+ Ref<Resource> resource = ResourceLoader::load(path);
+ value = resource;
+ }
}
if (global_shader_uniforms.variables.has(name)) {