[Bf-blender-cvs] [455f972e694] greasepencil-refactor: GPencil: Fix previously selected strokes shows selected after lock their layer
Antonio Vazquez
noreply at git.blender.org
Fri Jan 17 14:43:42 CET 2020
Commit: 455f972e694159afcfda1ca6587a6c9fc2d8baa1
Author: Antonio Vazquez
Date: Fri Jan 17 14:43:20 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB455f972e694159afcfda1ca6587a6c9fc2d8baa1
GPencil: Fix previously selected strokes shows selected after lock their layer
===================================================================
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 4f0b5133d84..d9e0b41baeb 100644
--- a/source/blender/draw/intern/draw_cache_impl_gpencil.c
+++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c
@@ -663,11 +663,16 @@ static float gpencil_point_edit_weight(const MDeformVert *dvert, int v, int vgin
return (dvert && dvert[v].dw) ? defvert_find_weight(&dvert[v], vgindex) : -1.0f;
}
-static void gpencil_edit_stroke_iter_cb(bGPDlayer *UNUSED(gpl),
+static void gpencil_edit_stroke_iter_cb(bGPDlayer *gpl,
bGPDframe *gpf,
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;
More information about the Bf-blender-cvs
mailing list