Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

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

2.0
Juan Linietsky 2015-04-24 23:46:42 +07:00
parent f971ae32e1
commit 52e2f4606f
3 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
demos/2d/isometric_light/torch.scn
View File

Binary file not shown.

BIN
demos/2d/isometric_light/torch_shader.res
View File

Binary file not shown.

2
drivers/gles2/rasterizer_gles2.cpp
Unescape Escape View File

@ -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));