diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-12-13 23:31:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-13 23:31:43 +0100 |
| commit | fc517e6c899f4e5b1a016bf5eb0e5014a1b44017 (patch) | |
| tree | e9431adcb272f31e069887f884031f1ad2defae0 /drivers/gles3/rasterizer_canvas_gles3.cpp | |
| parent | c7c561ffd5d0e46cd1db3dbb583c6ca3841ab894 (diff) | |
| parent | bdd4001ef012c9e7a95b501225c3f6540a0299f3 (diff) | |
Merge pull request #70003 from clayjohn/GLES3-cc
Various fixes and documentation for CanvasGroup
Diffstat (limited to 'drivers/gles3/rasterizer_canvas_gles3.cpp')
| -rw-r--r-- | drivers/gles3/rasterizer_canvas_gles3.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp index c7e7227916..7b39641029 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.cpp +++ b/drivers/gles3/rasterizer_canvas_gles3.cpp @@ -588,10 +588,12 @@ void RasterizerCanvasGLES3::_render_items(RID p_to_render_target, int p_item_cou material = default_clip_children_material; } } else { - if (ci->canvas_group->mode == RS::CANVAS_GROUP_MODE_CLIP_ONLY) { - material = default_clip_children_material; - } else { - material = default_canvas_group_material; + if (material.is_null()) { + if (ci->canvas_group->mode == RS::CANVAS_GROUP_MODE_CLIP_ONLY) { + material = default_clip_children_material; + } else { + material = default_canvas_group_material; + } } } } |