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_vertex.c | |
| parent | 91d0c7f9793e4a4a72a959c921b654faa795b17e (diff) | |
| parent | b97a2c3688ad29b051898ff2be5f9b9e98bebdba (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_vertex.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 42c5aea152a..d6aaaf31c21 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -1079,7 +1079,7 @@ static void ed_vwpaintmode_enter_generic( BKE_object_free_derived_caches(ob); if (mode_flag == OB_MODE_VERTEX_PAINT) { - const ePaintMode paint_mode = ePaintVertex; + const ePaintMode paint_mode = PAINT_MODE_VERTEX; ED_mesh_color_ensure(me, NULL); BKE_paint_ensure(scene->toolsettings, (Paint **)&scene->toolsettings->vpaint); @@ -1088,7 +1088,7 @@ static void ed_vwpaintmode_enter_generic( BKE_paint_init(bmain, scene, paint_mode, PAINT_CURSOR_VERTEX_PAINT); } else if (mode_flag == OB_MODE_WEIGHT_PAINT) { - const ePaintMode paint_mode = ePaintWeight; + const ePaintMode paint_mode = PAINT_MODE_WEIGHT; BKE_paint_ensure(scene->toolsettings, (Paint **)&scene->toolsettings->wpaint); Paint *paint = BKE_paint_get_active_from_paintmode(scene, paint_mode); @@ -1409,7 +1409,7 @@ static void vwpaint_update_cache_variants(bContext *C, VPaint *vp, Object *ob, P * brush coord/pressure/etc. * It's more an events design issue, which doesn't split coordinate/pressure/angle * changing events. We should avoid this after events system re-design */ - if (paint_supports_dynamic_size(brush, ePaintSculpt) || cache->first_time) { + if (paint_supports_dynamic_size(brush, PAINT_MODE_SCULPT) || cache->first_time) { cache->pressure = RNA_float_get(ptr, "pressure"); } @@ -1425,7 +1425,7 @@ static void vwpaint_update_cache_variants(bContext *C, VPaint *vp, Object *ob, P } } - if (BKE_brush_use_size_pressure(scene, brush) && paint_supports_dynamic_size(brush, ePaintSculpt)) { + if (BKE_brush_use_size_pressure(scene, brush) && paint_supports_dynamic_size(brush, PAINT_MODE_SCULPT)) { cache->radius = cache->initial_radius * cache->pressure; } else { |