diff options
| author | Alexander Gavrilov <angavrilov@gmail.com> | 2016-01-18 22:00:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-01-20 03:43:09 +0300 |
| commit | bda0820d575061fca3514281f81f04870bbd495e (patch) | |
| tree | bd151d7e846b0011a33e5afd4d11d69a5fa027f6 /source/blender/blenkernel/intern/DerivedMesh.c | |
| parent | 5feb3688fb6a6191673477d673f864310673b823 (diff) | |
Support multi-paint & show zero-weights as black
Specifically, when only one bone is selected and it's not really active.
(With multiple bones on the other hand that behavior is forced on,
since multi-paint can't modify purely zero weight verts and that's important.)
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 9fc438319cb..b5e6b6c4bac 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1333,9 +1333,9 @@ typedef struct DMWeightColorInfo { static int dm_drawflag_calc(const ToolSettings *ts) { - return ((ts->multipaint ? CALC_WP_MULTIPAINT : - /* CALC_WP_GROUP_USER_ACTIVE or CALC_WP_GROUP_USER_ALL*/ - (1 << ts->weightuser)) | + return ((ts->multipaint ? CALC_WP_MULTIPAINT : 0) | + /* CALC_WP_GROUP_USER_ACTIVE or CALC_WP_GROUP_USER_ALL*/ + (1 << ts->weightuser) | (ts->auto_normalize ? CALC_WP_AUTO_NORMALIZE : 0)); } |