diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2021-01-22 13:26:15 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2021-01-22 13:26:15 +0300 |
commit | d179e1c6e460474e398e2831ecfd3924a12f5210 (patch) | |
tree | ca3795ce959397f0e8345fbb4a3d2ba3aae80fef /source | |
parent | 8eaea99d987194a5dc32aec404a2b1784eea0841 (diff) | |
parent | 0373d1b09fc9db2c237a507dc6ef649c5d2b8703 (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_vertex_paint.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/gpencil/gpencil_vertex_paint.c b/source/blender/editors/gpencil/gpencil_vertex_paint.c index 7fb57534638..ae94836af03 100644 --- a/source/blender/editors/gpencil/gpencil_vertex_paint.c +++ b/source/blender/editors/gpencil/gpencil_vertex_paint.c @@ -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; |