diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-07 03:58:57 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-07 03:59:41 +0300 |
commit | 101fd08348e5717f98af93481e6cc97d3bf920c3 (patch) | |
tree | 32a8130570ed435290656f48c7af8bfde7e96532 /source/blender/editors/sculpt_paint/paint_stroke.c | |
parent | 4e9911663a22766f6751d33ae84c1ebcc1fae559 (diff) | |
parent | 59e70d5f8d68d8fa9eb34f75866578fafece8709 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_stroke.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_stroke.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index a1ae32f2e9a..e31a2617238 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -459,7 +459,7 @@ static bool paint_stroke_use_jitter(ePaintMode mode, Brush *brush, bool invert) /* jitter-ed brush gives weird and unpredictable result for this * kinds of stroke, so manually disable jitter usage (sergey) */ use_jitter &= (brush->flag & (BRUSH_DRAG_DOT | BRUSH_ANCHORED)) == 0; - use_jitter &= (!ELEM(mode, ePaintTexture2D, ePaintTextureProjective) || + use_jitter &= (!ELEM(mode, ePaintTexture2D, ePaintTexture3D) || !(invert && brush->imagepaint_tool == PAINT_TOOL_CLONE)); @@ -862,7 +862,7 @@ bool paint_supports_dynamic_size(Brush *br, ePaintMode mode) break; case ePaintTexture2D: /* fall through */ - case ePaintTextureProjective: + case ePaintTexture3D: if ((br->imagepaint_tool == PAINT_TOOL_FILL) && (br->flag & BRUSH_USE_GRADIENT)) { @@ -898,7 +898,7 @@ bool paint_supports_smooth_stroke(Brush *br, ePaintMode mode) bool paint_supports_texture(ePaintMode mode) { /* omit: PAINT_WEIGHT, PAINT_SCULPT_UV, PAINT_INVALID */ - return ELEM(mode, ePaintSculpt, ePaintVertex, ePaintTextureProjective, ePaintTexture2D); + return ELEM(mode, ePaintSculpt, ePaintVertex, ePaintTexture3D, ePaintTexture2D); } /* return true if the brush size can change during paint (normally used for pressure) */ |