[Bf-blender-cvs] [2dff68f423c] greasepencil-object: Fix multiframe error when lock layer
Antonio Vazquez
noreply at git.blender.org
Sat Dec 16 10:46:19 CET 2017
Commit: 2dff68f423c8c8631d9f09688a97c1b5b68ce484
Author: Antonio Vazquez
Date: Sat Dec 16 10:46:09 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB2dff68f423c8c8631d9f09688a97c1b5b68ce484
Fix multiframe error when lock layer
There was a segment fault if the some layer was locked and enable multiframe edit / sculpt or weight paint.
The shading group must be created because is used in multiedit lines.
===================================================================
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index 99edefffbdd..b43dc11458c 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -581,7 +581,7 @@ static void gpencil_add_editpoints_shgroup(
GPENCIL_StorageList *stl, GpencilBatchCache *cache,ToolSettings *ts, Object *ob,
bGPdata *gpd, bGPDlayer *gpl, bGPDframe *gpf, bGPDstroke *gps)
{
- if (((gpl->flag & GP_LAYER_LOCKED) == 0) && (GPENCIL_ANY_EDIT_MODE(gpd))) {
+ if (GPENCIL_ANY_EDIT_MODE(gpd)) {
const DRWContextState *draw_ctx = DRW_context_state_get();
Object *obact = draw_ctx->obact;
if (obact->type != OB_GPENCIL) {
More information about the Bf-blender-cvs
mailing list