diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-30 04:00:29 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-30 04:00:29 +0300 |
| commit | 18965905d0fdb2dd546d95ce9eaa4653cd1e3b17 (patch) | |
| tree | 5de29a997602e8107f07d49f1ca2b69309e85229 /source/blender/blenkernel/BKE_paint.h | |
| parent | e3fe8128e41bb7c576f02ba234dfabf5c399cb60 (diff) | |
| parent | e3546a5097b1b30a3c694ce0f6b98c2f7e70510c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_paint.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_paint.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index f865a6a7cdd..5c7684f9fe1 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -222,14 +222,14 @@ typedef struct SculptSession { /* For non-airbrush painting to re-apply from the original (MLoop aligned). */ unsigned int *previous_color; - unsigned int *previous_accum; + float *previous_accum; } vpaint; struct { struct SculptVertexPaintGeomMap gmap; /* Vertex aligned arrays of weights. */ - /* For non-airbrush painting to re-apply from the original. */ + float *previous_accum; float *previous_weight; /* Keep track of how much each vertex has been painted (non-airbrush only). */ float *alpha_weight; |