[Bf-blender-cvs] [199c12cb6fb] temp-gpencil-interpolate: GPencil: Fix merge problems

[Antonio Vazquez]

Commit: 199c12cb6fb326b0884f9ae925c7e769395ff930
Author: Antonio Vazquez
Date:   Tue Feb 9 16:30:45 2021 +0100
Branches: temp-gpencil-interpolate
https://developer.blender.org/rB199c12cb6fb326b0884f9ae925c7e769395ff930

GPencil: Fix merge problems

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

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

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

diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 448b956c273..d25fe027afe 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -5026,6 +5026,7 @@ static int gpencil_cutter_lasso_select(bContext *C,
               changed = true;
               pt->flag |= GP_SPOINT_SELECT;
               gps->flag |= GP_STROKE_SELECT;
+              BKE_gpencil_stroke_select_index_set(gpd, gps, false);
               float r_hita[3], r_hitb[3];
               if (gps->totpoints > 1) {
                 ED_gpencil_select_stroke_segment(