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/renderer_canvas_render_rd.cpp | |
| parent | 794606657745e77b89523f19c5e3b69c838f0cb7 (diff) | |
| parent | b6af457d2532794b256c2e4783d2507b5f72fc69 (diff) | |
| download | redot-engine-036b7a09851fb0bfe97f1c5086ef99b1cfb87d2f.tar.gz | |
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/renderer_canvas_render_rd.cpp')
| -rw-r--r-- | servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp b/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp index 6267f684e3..647c348d9f 100644 --- a/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp +++ b/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp @@ -1102,7 +1102,7 @@ void RendererCanvasRenderRD::_render_items(RID p_to_render_target, int p_item_co if (material_data->shader_data->version.is_valid() && material_data->shader_data->valid) { pipeline_variants = &material_data->shader_data->pipeline_variants; // Update uniform set. - if (RD::get_singleton()->uniform_set_is_valid(material_data->uniform_set)) { // Material may not have a uniform set. + if (material_data->uniform_set.is_valid() && RD::get_singleton()->uniform_set_is_valid(material_data->uniform_set)) { // Material may not have a uniform set. RD::get_singleton()->draw_list_bind_uniform_set(draw_list, material_data->uniform_set, MATERIAL_UNIFORM_SET); } } else { |