blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Sculpt: Fix T101914: Wpaint gradient tool doesn't work with vertex mask 

Reviewed by: Julian Kaspar & Joseph Eagar
Differential Revision: https://developer.blender.org/D16293
Ref D16293
This commit is contained in:
Edward 2022-11-10 11:02:15 -08:00 committed by Joseph Eagar
parent 366796bbbe
commit 59618c7646
Notes: blender-bot 2023-02-14 06:42:54 +01:00 
Referenced by issue #103027, Weight Paint gradient tool doesn't work with Paint Mask on
Referenced by issue #102967, 3.4: Potential candidates for corrective releases
Referenced by issue #101914, Weight Paint Gradient Tool does not work with Masks
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
View File

@ -587,6 +587,7 @@ typedef struct WPGradient_userData {
Scene *scene;
Mesh *me;
MDeformVert *dvert;
const bool *select_vert;
Brush *brush;
const float *sco_start; /* [2] */
const float *sco_end; /* [2] */
@ -683,7 +684,7 @@ static void gradientVertInit__mapFunc(void *userData,
WPGradient_userData *grad_data = userData;
WPGradient_vertStore *vs = &grad_data->vert_cache->elem[index];
if (grad_data->use_select && !(grad_data->dvert[index].flag & SELECT)) {
if (grad_data->use_select && (grad_data->select_vert && !grad_data->select_vert[index])) {
copy_v2_fl(vs->sco, FLT_MAX);
return;
}
@ -811,6 +812,8 @@ static int paint_weight_gradient_exec(bContext *C, wmOperator *op)
data.scene = scene;
data.me = ob->data;
data.dvert = dverts;
data.select_vert = (const bool *)CustomData_get_layer_named(
&me->vdata, CD_PROP_BOOL, ".select_vert");
data.sco_start = sco_start;
data.sco_end = sco_end;
data.sco_line_div = 1.0f / len_v2v2(sco_start, sco_end);