diff options
| author | Clay John <claynjohn@gmail.com> | 2021-08-31 11:28:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-31 11:28:48 -0700 |
| commit | 036b7a09851fb0bfe97f1c5086ef99b1cfb87d2f (patch) | |
| tree | d9a6c05e3297077135cc43916bd76de203e41341 /servers/rendering/renderer_rd/forward_clustered | |
| parent | 794606657745e77b89523f19c5e3b69c838f0cb7 (diff) | |
| parent | b6af457d2532794b256c2e4783d2507b5f72fc69 (diff) | |
Merge pull request #51873 from Chaosus/fix_uniform_error_spam
Fix incorrect checking of uniform set to prevent error spam (2)
Diffstat (limited to 'servers/rendering/renderer_rd/forward_clustered')
| -rw-r--r-- | servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp b/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp index 611f7c6494..1b730567d9 100644 --- a/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp +++ b/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp @@ -484,7 +484,7 @@ void RenderForwardClustered::_render_list_template(RenderingDevice::DrawListID p if (material_uniform_set != prev_material_uniform_set) { // Update uniform set. - if (RD::get_singleton()->uniform_set_is_valid(material_uniform_set)) { // Material may not have a uniform set. + if (material_uniform_set.is_valid() && RD::get_singleton()->uniform_set_is_valid(material_uniform_set)) { // Material may not have a uniform set. RD::get_singleton()->draw_list_bind_uniform_set(draw_list, material_uniform_set, MATERIAL_UNIFORM_SET); } |