瀏覽代碼

-Objects with BlendMode!=MIX do not get affected by CanvasModulate, fixes #1724

Juan Linietsky 10 年之前
父節點
當前提交
52e2f4606f
共有 3 個文件被更改,包括 1 次插入1 次删除
  1. 二進制
      demos/2d/isometric_light/torch.scn
  2. 二進制
      demos/2d/isometric_light/torch_shader.res
  3. 1 1
      drivers/gles2/rasterizer_gles2.cpp

二進制
demos/2d/isometric_light/torch.scn


二進制
demos/2d/isometric_light/torch_shader.res


+ 1 - 1
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));