[Bf-blender-cvs] [9a537b63a5a] blender-v2.93-release: Fix: greasepencil selection of entire_strokes not working

[Philipp Oeser]

Commit: 9a537b63a5ad22da689b6a799a24b4c5ef269301
Author: Philipp Oeser
Date:   Tue Nov 22 13:09:41 2022 +0100
Branches: blender-v2.93-release
https://developer.blender.org/rB9a537b63a5ad22da689b6a799a24b4c5ef269301

Fix: greasepencil selection of entire_strokes not working

Caused by rB85f90ed6fd88.

Above commit made sure whole strokes are selected when the
GP_SELECTMODE_STROKE is used in different modes, but ignored the fact
that this can also already be set by the entire_strokes select operator
property.

This is now corrected.

Differential Revision: https://developer.blender.org/D16576

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

M	source/blender/editors/gpencil/gpencil_select.c

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

diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c
index 55521ac4d15..913dfcbb8f7 100644
--- a/source/blender/editors/gpencil/gpencil_select.c
+++ b/source/blender/editors/gpencil/gpencil_select.c
@@ -2219,15 +2219,15 @@ static int gpencil_select_exec(bContext *C, wmOperator *op)
 
   /* if select mode is stroke, use whole stroke */
   if ((ob) && (ob->mode == OB_MODE_SCULPT_GPENCIL)) {
-    whole = (bool)(gpencil_select_mode_from_sculpt(ts->gpencil_selectmode_sculpt) ==
+    whole |= (bool)(gpencil_select_mode_from_sculpt(ts->gpencil_selectmode_sculpt) ==
                    GP_SELECTMODE_STROKE);
   }
   else if ((ob) && (ob->mode == OB_MODE_VERTEX_GPENCIL)) {
-    whole = (bool)(gpencil_select_mode_from_vertex(ts->gpencil_selectmode_sculpt) ==
+    whole |= (bool)(gpencil_select_mode_from_vertex(ts->gpencil_selectmode_sculpt) ==
                    GP_SELECTMODE_STROKE);
   }
   else {
-    whole = (bool)(ts->gpencil_selectmode_edit == GP_SELECTMODE_STROKE);
+    whole |= (bool)(ts->gpencil_selectmode_edit == GP_SELECTMODE_STROKE);
   }
 
   if (is_curve_edit) {