blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix weight paint normalizing w/ locked groups 

Reported as part of T47123

Checks for locked groups assumed auto-normalize
and would distribute wight between groups even with auto-normalize disabled.
This commit is contained in:
Campbell Barton 2016-01-14 14:05:15 +11:00
parent 3a51a90e56
commit 10ac7c0f15
Notes: blender-bot 2023-02-14 08:19:26 +01:00 
Referenced by issue #47123, Weird auto-normalize behavior in weight paint with locked groups.
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/sculpt_paint/paint_vertex.c
View File

@ -1700,8 +1700,6 @@ static void do_weight_paint_vertex(
MDeformVert *dv_mirr;
MDeformWeight *dw_mirr;
const short do_multipaint_totsel = (wpi->do_multipaint && wpi->defbase_tot_sel > 1);
if (wp->flag & VP_ONLYVGROUP) {
dw = defvert_find_index(dv, wpi->vgroup_active);
dw_prev = defvert_find_index(wp->wpaint_prev + index, wpi->vgroup_active);
@ -1765,15 +1763,15 @@ static void do_weight_paint_vertex(
dw_mirr = NULL;
}
/* TODO: De-duplicate the simple weight paint - jason */
/* ... or not, since its <10 SLOC - campbell */
/* If there are no locks or multipaint,
/* If there are no normalize-locks or multipaint,
* then there is no need to run the more complicated checks */
if ((do_multipaint_totsel == false) &&
(wpi->lock_flags == NULL || has_locked_group(dv, wpi->defbase_tot, wpi->vgroup_validmap, wpi->lock_flags) == false))
{
const bool do_multipaint_totsel =
(wpi->do_multipaint && wpi->defbase_tot_sel > 1);
const bool do_locked_normalize =
(wpi->do_auto_normalize && wpi->lock_flags &&
has_locked_group(dv, wpi->defbase_tot, wpi->vgroup_validmap, wpi->lock_flags));
if ((do_multipaint_totsel || do_locked_normalize) == false) {
dw->weight = wpaint_blend(wp, dw->weight, dw_prev->weight, alpha, paintweight,
wpi->brush_alpha_value, wpi->do_flip, false);