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/makesrna/intern/rna_brush.c | |
| parent | 91d0c7f9793e4a4a72a959c921b654faa795b17e (diff) | |
| parent | b97a2c3688ad29b051898ff2be5f9b9e98bebdba (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_brush.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index d263ead29b3..fc443f6c2fc 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -579,7 +579,7 @@ static const EnumPropertyItem *rna_Brush_direction_itemf(bContext *C, PointerRNA Brush *me = (Brush *)(ptr->data); switch (mode) { - case ePaintSculpt: + case PAINT_MODE_SCULPT: switch (me->sculpt_tool) { case SCULPT_TOOL_DRAW: case SCULPT_TOOL_CREASE: @@ -620,8 +620,8 @@ static const EnumPropertyItem *rna_Brush_direction_itemf(bContext *C, PointerRNA return prop_default_items; } - case ePaintTexture2D: - case ePaintTexture3D: + case PAINT_MODE_TEXTURE_2D: + case PAINT_MODE_TEXTURE_3D: switch (me->imagepaint_tool) { case PAINT_TOOL_SOFTEN: return prop_soften_sharpen_items; @@ -650,9 +650,9 @@ static const EnumPropertyItem *rna_Brush_stroke_itemf(bContext *C, PointerRNA *U }; switch (mode) { - case ePaintSculpt: - case ePaintTexture2D: - case ePaintTexture3D: + case PAINT_MODE_SCULPT: + case PAINT_MODE_TEXTURE_2D: + case PAINT_MODE_TEXTURE_3D: return sculpt_stroke_method_items; default: |