[Bf-blender-cvs] [04c3f8183bf] greasepencil-object: GPencil: Fix Ghost points in edit mode

[Antonio Vazquez]

Commit: 04c3f8183bf4739385770b8a6861b23039183bb8
Author: Antonio Vazquez
Date:   Fri Feb 28 20:34:37 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB04c3f8183bf4739385770b8a6861b23039183bb8

GPencil: Fix Ghost points in edit mode

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

M	source/blender/draw/intern/draw_cache_impl_gpencil.c

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

diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.c b/source/blender/draw/intern/draw_cache_impl_gpencil.c
index 0d913c49e58..4b46d72f732 100644
--- a/source/blender/draw/intern/draw_cache_impl_gpencil.c
+++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c
@@ -665,11 +665,6 @@ static void gpencil_edit_stroke_iter_cb(bGPDlayer *gpl,
                                         bGPDstroke *gps,
                                         void *thunk)
 {
-  /* Cancel if layer is locked. */
-  if (gpl->flag & GP_LAYER_LOCKED) {
-    return;
-  }
-
   gpEditIterData *iter = (gpEditIterData *)thunk;
   const int v_len = gps->totpoints;
   const int v = gps->runtime.stroke_start + 1;
@@ -677,7 +672,9 @@ static void gpencil_edit_stroke_iter_cb(bGPDlayer *gpl,
   gpEditVert *vert_ptr = iter->verts + v;
 
   uint32_t sflag = 0;
-  SET_FLAG_FROM_TEST(sflag, gps->flag & GP_STROKE_SELECT, GP_EDIT_STROKE_SELECTED);
+  SET_FLAG_FROM_TEST(sflag,
+                     ((gpl->flag & GP_LAYER_LOCKED) == 0) && gps->flag & GP_STROKE_SELECT,
+                     GP_EDIT_STROKE_SELECTED);
   SET_FLAG_FROM_TEST(sflag, gpf->runtime.onion_id != 0.0f, GP_EDIT_MULTIFRAME);
 
   for (int i = 0; i < v_len; i++) {