diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-14 03:24:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-14 03:27:42 +0300 |
| commit | 2b3b481c3d6553e7a4dd90efc25518fe8e1a5bc6 (patch) | |
| tree | e71363a67c25d8ff951c1541069fb50d8974ab5a /source/blender/editors/sculpt_paint/paint_stroke.c | |
| parent | 91d0c7f9793e4a4a72a959c921b654faa795b17e (diff) | |
| parent | b97a2c3688ad29b051898ff2be5f9b9e98bebdba (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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index af2ed032931..15dd0438585 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -225,7 +225,7 @@ static void paint_draw_line_cursor(bContext *C, int x, int y, void *customdata) static bool paint_tool_require_location(Brush *brush, ePaintMode mode) { switch (mode) { - case ePaintSculpt: + case PAINT_MODE_SCULPT: if (ELEM(brush->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_ROTATE, SCULPT_TOOL_SNAKE_HOOK, SCULPT_TOOL_THUMB)) @@ -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, ePaintTexture3D) || + use_jitter &= (!ELEM(mode, PAINT_MODE_TEXTURE_2D, PAINT_MODE_TEXTURE_3D) || !(invert && brush->imagepaint_tool == PAINT_TOOL_CLONE)); @@ -856,13 +856,13 @@ bool paint_supports_dynamic_size(Brush *br, ePaintMode mode) return false; switch (mode) { - case ePaintSculpt: + case PAINT_MODE_SCULPT: if (sculpt_is_grab_tool(br)) return false; break; - case ePaintTexture2D: /* fall through */ - case ePaintTexture3D: + case PAINT_MODE_TEXTURE_2D: /* fall through */ + case PAINT_MODE_TEXTURE_3D: if ((br->imagepaint_tool == PAINT_TOOL_FILL) && (br->flag & BRUSH_USE_GRADIENT)) { @@ -885,7 +885,7 @@ bool paint_supports_smooth_stroke(Brush *br, ePaintMode mode) } switch (mode) { - case ePaintSculpt: + case PAINT_MODE_SCULPT: if (sculpt_is_grab_tool(br)) return false; break; @@ -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, ePaintTexture3D, ePaintTexture2D); + return ELEM(mode, PAINT_MODE_SCULPT, PAINT_MODE_VERTEX, PAINT_MODE_TEXTURE_3D, PAINT_MODE_TEXTURE_2D); } /* return true if the brush size can change during paint (normally used for pressure) */ @@ -908,7 +908,7 @@ bool paint_supports_dynamic_tex_coords(Brush *br, ePaintMode mode) return false; switch (mode) { - case ePaintSculpt: + case PAINT_MODE_SCULPT: if (sculpt_is_grab_tool(br)) return false; break; |