diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-30 13:48:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-30 13:48:01 +0100 |
| commit | 6a07d7f83f10ee8f38f7890aff51eac3f4e581f8 (patch) | |
| tree | 12f797488d5d250e285efaba06ccb0803020feee /drivers/gles2/rasterizer_canvas_gles2.cpp | |
| parent | 8b7028e7b13b7a0ed6b8a4d589ada7c83914242e (diff) | |
| parent | 8c99b6fb2f0a4f550f897c7871658965600e1a1e (diff) | |
Merge pull request #24661 from humblers/fix-unshaded-gles2
Fix unshaded light mode on GLES2
Diffstat (limited to 'drivers/gles2/rasterizer_canvas_gles2.cpp')
| -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 6aac35a332..f3fc356879 100644 --- a/drivers/gles2/rasterizer_canvas_gles2.cpp +++ b/drivers/gles2/rasterizer_canvas_gles2.cpp @@ -1288,7 +1288,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 = (shader_cache && blend_mode != RasterizerStorageGLES2::Shader::CanvasItem::BLEND_MODE_MIX); + bool unshaded = shader_cache && (shader_cache->canvas_item.light_mode == RasterizerStorageGLES2::Shader::CanvasItem::LIGHT_MODE_UNSHADED || (blend_mode != RasterizerStorageGLES2::Shader::CanvasItem::BLEND_MODE_MIX && blend_mode != RasterizerStorageGLES2::Shader::CanvasItem::BLEND_MODE_PMALPHA)); bool reclip = false; if (last_blend_mode != blend_mode) { |