Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2018-09-26 16:27:56 +0300
committerAntonioya <blendergit@gmail.com>2018-09-26 16:28:11 +0300
commit81a7d3cd0729f204316fd82fdb64932befe0e9ff (patch)
treec0367f7046055eeed9b10feb0ced96fdf4aed03b /source/blender/draw/engines/gpencil/gpencil_draw_utils.c
parent280de3df07919d62a3d9ada4989342c3fc7a251f (diff)
Fix T56926: Highlighted selection doesn't disappear when locking layer
Diffstat (limited to 'source/blender/draw/engines/gpencil/gpencil_draw_utils.c')
-rw-r--r--source/blender/draw/engines/gpencil/gpencil_draw_utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 516c27ae21d..d5fd6b71239 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -878,7 +878,8 @@ static void gpencil_draw_strokes(
/* edit points (only in edit mode and not play animation not render) */
if ((draw_ctx->obact == ob) && (src_gps) &&
- (!playing) && (!is_render) && (!cache_ob->is_dup_ob))
+ (!playing) && (!is_render) && (!cache_ob->is_dup_ob)
+ && ((gpl->flag & GP_LAYER_LOCKED) == 0))
{
if (!stl->g_data->shgrps_edit_line) {
stl->g_data->shgrps_edit_line = DRW_shgroup_create(e_data->gpencil_line_sh, psl->edit_pass);