diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-14 09:26:47 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-14 09:26:47 +0200 |
| commit | e0651ed4b50d11127be21a6e78b08e29d5d222b0 (patch) | |
| tree | 3f85664d76a9e252e10062f8d02ffcc71e134b72 /servers/rendering/renderer_rd/storage_rd | |
| parent | 1930b491d6590175ff5bda61407af57c07c273fb (diff) | |
| parent | 0b7e2dfdfc57fac776d4da1c579aa3f1c325c1f0 (diff) | |
| download | redot-engine-e0651ed4b50d11127be21a6e78b08e29d5d222b0.tar.gz | |
Merge pull request #78199 from clayjohn/detect_3d
Ensure that "detect 3D" is only called when using 3D shaders
Diffstat (limited to 'servers/rendering/renderer_rd/storage_rd')
| -rw-r--r-- | servers/rendering/renderer_rd/storage_rd/material_storage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/rendering/renderer_rd/storage_rd/material_storage.cpp b/servers/rendering/renderer_rd/storage_rd/material_storage.cpp index 42db459133..8d1eb87e3c 100644 --- a/servers/rendering/renderer_rd/storage_rd/material_storage.cpp +++ b/servers/rendering/renderer_rd/storage_rd/material_storage.cpp @@ -1033,7 +1033,7 @@ bool MaterialStorage::MaterialData::update_parameters_uniform_set(const HashMap< } if (p_textures_dirty && tex_uniform_count) { - update_textures(p_parameters, p_default_texture_params, p_texture_uniforms, texture_cache.ptrw(), true); + update_textures(p_parameters, p_default_texture_params, p_texture_uniforms, texture_cache.ptrw(), p_use_linear_color); } if (p_ubo_size == 0 && (p_texture_uniforms.size() == 0)) { |