diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-06-19 16:34:52 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-19 16:34:52 +0400 |
| commit | 74f2e7fbc7f537b963611dbe27a5286c331b801d (patch) | |
| tree | 7354fa8601f1d06f4dcc7282fcc9f6e561aa0caf /source/blender/blenkernel/intern/DerivedMesh.c | |
| parent | 7ecc3f47342dafce3afa3cebbd08136b780fef0f (diff) | |
View3D: Handle un-weighed vertex color properly
D608 by Gaia Clary
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 5339c3fc5d5..7a91c01664a 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1213,14 +1213,15 @@ static void calc_weightpaint_vert_array(Object *ob, DerivedMesh *dm, int const d } } else { - int col_i; + unsigned char col[4]; if (draw_flag & (CALC_WP_GROUP_USER_ACTIVE | CALC_WP_GROUP_USER_ALL)) { - col_i = 0; + copy_v3_v3_char((char *)col, dm_wcinfo->alert_color); + col[3] = 255; } else { - weightpaint_color((unsigned char *)&col_i, dm_wcinfo, 0.0f); + weightpaint_color(col, dm_wcinfo, 0.0f); } - fill_vn_i((int *)r_wtcol_v, numVerts, col_i); + fill_vn_i((int *)r_wtcol_v, numVerts, *((int *)col)); } } |