From 52e2f4606f1df7ff84187b8fbc0977ac4e97599d Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Fri, 24 Apr 2015 23:46:42 -0300
Subject: -Objects with BlendMode!=MIX do not get affected by CanvasModulate,
 fixes #1724

---
 drivers/gles2/rasterizer_gles2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drivers/gles2')

diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp
index 0598d9222..759d20aab 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));
-- 
cgit v1.2.3-70-g09d2