[Bf-blender-cvs] [ea28ccc885f] greasepencil-object: GPencil: Fix poll for all select tools in Vertex Paint

[Antonio Vazquez]

Commit: ea28ccc885f09d3861248d2e95394037169da21b
Author: Antonio Vazquez
Date:   Fri Nov 8 11:46:15 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBea28ccc885f09d3861248d2e95394037169da21b

GPencil: Fix poll for all select tools in Vertex Paint

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

M	source/blender/editors/gpencil/gpencil_select.c
M	source/blender/makesdna/DNA_gpencil_types.h

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

diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c
index 2fe54af6750..f38961db07b 100644
--- a/source/blender/editors/gpencil/gpencil_select.c
+++ b/source/blender/editors/gpencil/gpencil_select.c
@@ -1013,7 +1013,7 @@ static int gpencil_circle_select_exec(bContext *C, wmOperator *op)
   const float scale = ts->gp_sculpt.isect_threshold;
 
   /* if not edit/sculpt mode, the event is catched but not processed */
-  if ((GPENCIL_NONE_EDIT_MODE(gpd)) && (!GPENCIL_VERTEX_MODE(gpd))) {
+  if (GPENCIL_NONE_EDIT_MODE(gpd)) {
     return OPERATOR_CANCELLED;
   }
 
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 9ba448936f3..60c83b091b4 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -689,7 +689,7 @@ typedef enum eGP_DrawMode {
   ((gpd) && (gpd->flag & (GP_DATA_STROKE_SCULPTMODE | GP_DATA_STROKE_WEIGHTMODE)))
 #define GPENCIL_NONE_EDIT_MODE(gpd) \
   ((gpd) && ((gpd->flag & (GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | \
-                           GP_DATA_STROKE_WEIGHTMODE)) == 0))
+                           GP_DATA_STROKE_WEIGHTMODE | GP_DATA_STROKE_VERTEXMODE)) == 0))
 #define GPENCIL_LAZY_MODE(brush, shift) \
   (((brush) && ((brush->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE) && (shift == 0))) || \
    (((brush->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE) == 0) && (shift == 1)))