Merge branch 'blender-v2.92-release'

This commit is contained in:
Antonio Vazquez 2021-01-22 11:26:15 +01:00
commit d179e1c6e4
1 changed files with 7 additions and 0 deletions

View File

@ -846,6 +846,13 @@ static bool gpencil_vertexpaint_select_stroke(tGP_BrushVertexpaintData *gso,
bool saved = false;
/* Check stroke masking. */
if (GPENCIL_ANY_VERTEX_MASK(gso->mask)) {
if ((gps->flag & GP_STROKE_SELECT) == 0) {
return false;
}
}
/* Check if the stroke collide with brush. */
if (!ED_gpencil_stroke_check_collision(gsc, gps, gso->mval, radius, bound_mat)) {
return false;