[Bf-blender-cvs] [81a7d3cd072] blender2.8: Fix T56926: Highlighted selection doesn't disappear when locking layer

Antonioya noreply at git.blender.org
Wed Sep 26 15:28:18 CEST 2018


Commit: 81a7d3cd0729f204316fd82fdb64932befe0e9ff
Author: Antonioya
Date:   Wed Sep 26 15:27:56 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB81a7d3cd0729f204316fd82fdb64932befe0e9ff

Fix T56926: Highlighted selection doesn't disappear when locking layer

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

M	source/blender/draw/engines/gpencil/gpencil_draw_utils.c

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

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);



More information about the Bf-blender-cvs mailing list