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_curve.c | |
parent | 91d0c7f9793e4a4a72a959c921b654faa795b17e (diff) | |
parent | b97a2c3688ad29b051898ff2be5f9b9e98bebdba (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_curve.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_curve.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_curve.c b/source/blender/editors/sculpt_paint/paint_curve.c index 90e068ab17a..e9918481408 100644 --- a/source/blender/editors/sculpt_paint/paint_curve.c +++ b/source/blender/editors/sculpt_paint/paint_curve.c @@ -660,17 +660,17 @@ static int paintcurve_draw_exec(bContext *C, wmOperator *UNUSED(op)) const char *name; switch (mode) { - case ePaintTexture2D: - case ePaintTexture3D: + case PAINT_MODE_TEXTURE_2D: + case PAINT_MODE_TEXTURE_3D: name = "PAINT_OT_image_paint"; break; - case ePaintWeight: + case PAINT_MODE_WEIGHT: name = "PAINT_OT_weight_paint"; break; - case ePaintVertex: + case PAINT_MODE_VERTEX: name = "PAINT_OT_vertex_paint"; break; - case ePaintSculpt: + case PAINT_MODE_SCULPT: name = "SCULPT_OT_brush_stroke"; break; default: @@ -700,7 +700,7 @@ static int paintcurve_cursor_invoke(bContext *C, wmOperator *UNUSED(op), const w ePaintMode mode = BKE_paintmode_get_active_from_context(C); switch (mode) { - case ePaintTexture2D: + case PAINT_MODE_TEXTURE_2D: { ARegion *ar = CTX_wm_region(C); SpaceImage *sima = CTX_wm_space_image(C); |