Merge pull request #21321 from karroffel/gles2-canvas-modulate

[GLES2] fix CanvasModulate not working
This commit is contained in:
Thomas Herzog 2018-08-23 18:15:42 +02:00 committed by GitHub
commit 0edb50f629
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -937,7 +937,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 = true || (shader_cache && blend_mode != RasterizerStorageGLES2::Shader::CanvasItem::BLEND_MODE_MIX);
bool unshaded = (shader_cache && blend_mode != RasterizerStorageGLES2::Shader::CanvasItem::BLEND_MODE_MIX);
bool reclip = false;
if (last_blend_mode != blend_mode) {