[Bf-blender-cvs] [5de51b46b65] master: Fix T69634: GPencil:Cutter Tool removes unexpected strokes on another layer

Antonio Vazquez noreply at git.blender.org
Sun Sep 8 16:49:57 CEST 2019


Commit: 5de51b46b6575bcd0814c2c3d14f267c717919d7
Author: Antonio Vazquez
Date:   Sun Sep 8 16:49:47 2019 +0200
Branches: master
https://developer.blender.org/rB5de51b46b6575bcd0814c2c3d14f267c717919d7

Fix T69634: GPencil:Cutter Tool removes unexpected strokes on another layer

The function was not checking the locked flag.

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

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 8442c906ac1..1834261e1bf 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -4489,6 +4489,10 @@ static int gpencil_cutter_lasso_select(bContext *C,
   /* dissolve selected points */
   bGPDstroke *gpsn;
   for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
+    if (gpl->flag & GP_LAYER_LOCKED) {
+      continue;
+    }
+
     bGPDframe *gpf = gpl->actframe;
     if (gpf == NULL) {
       continue;



More information about the Bf-blender-cvs mailing list