diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-04-24 23:46:42 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-24 23:46:42 -0300 |
| commit | 52e2f4606f1df7ff84187b8fbc0977ac4e97599d (patch) | |
| tree | 9fd63deff112fa2fb10fc0af901bad4bed3fecde /drivers/gles2 | |
| parent | f971ae32e1f16e453afdc4fd11cb29f8f3b0cf2a (diff) | |
-Objects with BlendMode!=MIX do not get affected by CanvasModulate, fixes #1724
Diffstat (limited to 'drivers/gles2')
| -rw-r--r-- | drivers/gles2/rasterizer_gles2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp index 0598d9222c..759d20aab1 100644 --- a/drivers/gles2/rasterizer_gles2.cpp +++ b/drivers/gles2/rasterizer_gles2.cpp @@ -9376,7 +9376,7 @@ void RasterizerGLES2::canvas_render_items(CanvasItem *p_item_list,int p_z,const _canvas_item_setup_shader_uniforms(material,shader_cache); } - bool unshaded = material && material->shading_mode==VS::CANVAS_ITEM_SHADING_UNSHADED; + bool unshaded = (material && material->shading_mode==VS::CANVAS_ITEM_SHADING_UNSHADED) || ci->blend_mode!=VS::MATERIAL_BLEND_MODE_MIX; if (unshaded) { canvas_shader.set_uniform(CanvasShaderGLES2::MODULATE,Color(1,1,1,1)); |