diff options
| author | Thomas Herzog <thomas.herzog@mail.com> | 2018-08-23 18:15:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-23 18:15:42 +0200 |
| commit | 0edb50f629bd878d2b8c98d1a6f50c23316f1ac2 (patch) | |
| tree | 5377cc47e54dbe2e277ae6c4af30e4d59b4329e4 /drivers | |
| parent | c760121c10cb700500fe79ca9d8ba6aebb50bb31 (diff) | |
| parent | 0f59cc179c859d1030b131c8b7fc122e826d2563 (diff) | |
Merge pull request #21321 from karroffel/gles2-canvas-modulate
[GLES2] fix CanvasModulate not working
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles2/rasterizer_canvas_gles2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gles2/rasterizer_canvas_gles2.cpp b/drivers/gles2/rasterizer_canvas_gles2.cpp index 432c9a9661..5b04517394 100644 --- a/drivers/gles2/rasterizer_canvas_gles2.cpp +++ b/drivers/gles2/rasterizer_canvas_gles2.cpp @@ -937,7 +937,7 @@ void RasterizerCanvasGLES2::canvas_render_items(Item *p_item_list, int p_z, cons } int blend_mode = shader_cache ? shader_cache->canvas_item.blend_mode : RasterizerStorageGLES2::Shader::CanvasItem::BLEND_MODE_MIX; - bool unshaded = true || (shader_cache && blend_mode != RasterizerStorageGLES2::Shader::CanvasItem::BLEND_MODE_MIX); + bool unshaded = (shader_cache && blend_mode != RasterizerStorageGLES2::Shader::CanvasItem::BLEND_MODE_MIX); bool reclip = false; if (last_blend_mode != blend_mode) { |