diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-06 17:15:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-06 17:15:03 +0200 |
| commit | da339f8ffcf4c33bb44129d718c0adde910e391d (patch) | |
| tree | 3b57bdc418e26be7ea41f2389ac96cf13ef589c8 /servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp | |
| parent | ed15d2c4137aef37a1e993e8bbef6e86c6e0f2e6 (diff) | |
| parent | ac4406cfbe14a9936d98860b1693154aa8131f18 (diff) | |
Merge pull request #51309 from Chaosus/fix_uniform_error_spam
Fix incorrect checking of uniform set to prevent error spam
Diffstat (limited to 'servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp')
| -rw-r--r-- | servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp | 3 |
1 files changed, 2 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 18c1fe02a0..053bda59a7 100644 --- a/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp +++ b/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp @@ -1089,7 +1089,8 @@ void RendererCanvasRenderRD::_render_items(RID p_to_render_target, int p_item_co if (material_data) { if (material_data->shader_data->version.is_valid() && material_data->shader_data->valid) { pipeline_variants = &material_data->shader_data->pipeline_variants; - if (material_data->uniform_set.is_valid()) { + // Update uniform set. + if (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 { |