diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-03 10:50:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-03 11:09:28 +0300 |
commit | f4b1f9b9255cda1af5e093f25cdde816bd94d8cd (patch) | |
tree | 80c829f3f45a66b0b3c64def25179a74cd37a26e /source/blender/blenkernel | |
parent | 515e69999e63aab7720e48b0c85233f61facce65 (diff) |
Vertex Paint: remove accumulate (soc-2017-vertex_paint)
This secondary accumulation option accumulated brush falloff.
The same option in image painting accumulates color
as vertex paiht 'Spray' does.
Giving this option different behavior for vertex paint seems strange.
Also this is basically increasing falloff over time.
Remove the new code, expose existing 'Spray' as 'Accumulate'
to match other paint modes.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_paint.h | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/paint.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index 19f332f5f54..3a70819ec58 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -220,18 +220,14 @@ typedef struct SculptSession { /* For non-airbrush painting to re-apply from the original (MLoop aligned). */ unsigned int *previous_color; - float *previous_accum; } vpaint; struct { struct SculptVertexPaintGeomMap gmap; - - /* Vertex aligned arrays of weights. */ - float *previous_accum; /* Keep track of how much each vertex has been painted (non-airbrush only). */ float *alpha_weight; - /* Needed to continuously re-apply over the same weights (VP_FLAG_SPRAY disabled). + /* Needed to continuously re-apply over the same weights (BRUSH_ACCUMULATE disabled). * Lazy initialize as needed (flag is set to 1 to tag it as uninitialized). */ struct MDeformVert *dvert_prev; } wpaint; diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index c2f1d05dd89..62af61585c1 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -681,13 +681,11 @@ void BKE_sculptsession_free_vwpaint_data(struct SculptSession *ss) gmap = &ss->mode.vpaint.gmap; MEM_SAFE_FREE(ss->mode.vpaint.previous_color); - MEM_SAFE_FREE(ss->mode.vpaint.previous_accum); } else if (ss->mode_type == OB_MODE_WEIGHT_PAINT) { gmap = &ss->mode.wpaint.gmap; MEM_SAFE_FREE(ss->mode.wpaint.alpha_weight); - MEM_SAFE_FREE(ss->mode.wpaint.previous_accum); if (ss->mode.wpaint.dvert_prev) { BKE_defvert_array_free_elems(ss->mode.wpaint.dvert_prev, ss->totvert); MEM_freeN(ss->mode.wpaint.dvert_prev); |