diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-09-21 03:37:40 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-09-21 03:37:40 +0400 |
commit | a0b36043376507aadd792905845c15e59a4b8a0b (patch) | |
tree | 94d48a2188fde551ed0f6c9ce20ecd7088cbc1f0 /source | |
parent | 1294fc7d9357163a4c7fe9dde6c0ae9dd05fc29c (diff) |
Last minute artist feedback tweak: Fill tool should not use masking
apart from stencil(texture) and face masks.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 0fb3e278f40..ef41cdd90ae 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -4533,9 +4533,14 @@ static void project_state_init(bContext *C, Object *ob, ProjPaintState *ps, int settings->imapaint.clone : NULL; /* setup projection painting data */ - ps->do_backfacecull = (settings->imapaint.flag & IMAGEPAINT_PROJECT_BACKFACE) ? 0 : 1; - ps->do_occlude = (settings->imapaint.flag & IMAGEPAINT_PROJECT_XRAY) ? 0 : 1; - ps->do_mask_normal = (settings->imapaint.flag & IMAGEPAINT_PROJECT_FLAT) ? 0 : 1; + if (ps->tool != PAINT_TOOL_FILL) { + ps->do_backfacecull = (settings->imapaint.flag & IMAGEPAINT_PROJECT_BACKFACE) ? 0 : 1; + ps->do_occlude = (settings->imapaint.flag & IMAGEPAINT_PROJECT_XRAY) ? 0 : 1; + ps->do_mask_normal = (settings->imapaint.flag & IMAGEPAINT_PROJECT_FLAT) ? 0 : 1; + } + else { + ps->do_backfacecull = ps->do_occlude = ps->do_mask_normal = 0; + } ps->do_new_shading_nodes = BKE_scene_use_new_shading_nodes(scene); /* only cache the value */ if (ps->tool == PAINT_TOOL_CLONE) |