[Bf-blender-cvs] [d179e1c6e46] master: Merge branch 'blender-v2.92-release'

[Antonio Vazquez]

Commit: d179e1c6e460474e398e2831ecfd3924a12f5210
Author: Antonio Vazquez
Date:   Fri Jan 22 11:26:15 2021 +0100
Branches: master
https://developer.blender.org/rBd179e1c6e460474e398e2831ecfd3924a12f5210

Merge branch 'blender-v2.92-release'

===================================================================



===================================================================

diff --cc source/blender/editors/gpencil/gpencil_vertex_paint.c
index 7fb57534638,e2c81d53fba..ae94836af03
--- a/source/blender/editors/gpencil/gpencil_vertex_paint.c
+++ b/source/blender/editors/gpencil/gpencil_vertex_paint.c
@@@ -846,8 -845,15 +846,15 @@@ static bool gpencil_vertexpaint_select_
  
    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, diff_mat)) {
 +  if (!ED_gpencil_stroke_check_collision(gsc, gps, gso->mval, radius, bound_mat)) {
      return false;
    }