diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-30 17:16:07 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-30 17:16:07 +0300 |
commit | 5dab34df509b1d08dad4c87d24b9fe37223a05cc (patch) | |
tree | 944101af8229c811eb13b92fffef3b566ec4c963 /source/blender | |
parent | 9aef2d961da7668e6984719856832f6136a2a8ce (diff) |
Overlay: Integration of TexturePaint with Workbench
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 10 | ||||
-rw-r--r-- | source/blender/draw/modes/paint_texture_mode.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index cdc598d01b0..5e83dcb7aae 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -196,11 +196,11 @@ int DRW_object_is_mode_shade(const Object *ob) BLI_assert(ob == DST.draw_ctx.obact); UNUSED_VARS_NDEBUG(ob); if ((DST.draw_ctx.object_mode & OB_MODE_EDIT) == 0) { - if ((DST.draw_ctx.object_mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) > 0) { - return !(ELEM(DST.draw_ctx.v3d->drawtype, OB_MATERIAL, OB_RENDER)); - } - else if (DST.draw_ctx.object_mode & (OB_MODE_TEXTURE_PAINT)) { - if ((DST.draw_ctx.v3d->flag2 & V3D_SHOW_MODE_SHADE_OVERRIDE) == 0) { + if ((DST.draw_ctx.object_mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)) > 0) { + if (ELEM(DST.draw_ctx.v3d->drawtype, OB_MATERIAL, OB_RENDER)) { + return false; + } + else if ((DST.draw_ctx.v3d->flag2 & V3D_SHOW_MODE_SHADE_OVERRIDE) == 0) { return true; } else { diff --git a/source/blender/draw/modes/paint_texture_mode.c b/source/blender/draw/modes/paint_texture_mode.c index 2a5eabd08fa..cf39b89d8f4 100644 --- a/source/blender/draw/modes/paint_texture_mode.c +++ b/source/blender/draw/modes/paint_texture_mode.c @@ -195,7 +195,7 @@ static void PAINT_TEXTURE_cache_init(void *vedata) { /* Create a pass */ DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | - DRW_STATE_BLEND | DRW_STATE_WIRE; + DRW_STATE_MULTIPLY | DRW_STATE_WIRE; psl->image_faces = DRW_pass_create("Image Color Pass", state); stl->g_data->shgroup_fallback = DRW_shgroup_create(e_data.fallback_sh, psl->image_faces); |