[Bf-blender-cvs] [4aee6cf376b] greasepencil-object: Show Edit Lines must be a main switch
Antonio Vazquez
noreply at git.blender.org
Sat Dec 9 17:23:33 CET 2017
Commit: 4aee6cf376b85b1d4cc6e098bf41132051bd857a
Author: Antonio Vazquez
Date: Sat Dec 9 17:23:08 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB4aee6cf376b85b1d4cc6e098bf41132051bd857a
Show Edit Lines must be a main switch
This option must be a general switch and not be affected by multiframe edition
===================================================================
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 fe0cbaa5c1b..99edefffbdd 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -595,7 +595,7 @@ static void gpencil_add_editpoints_shgroup(
cache->batch_edlin[cache->cache_idx] = DRW_gpencil_get_edlin_geom(gps, ts->gp_sculpt.alpha, gpd->flag);
}
if (cache->batch_edlin[cache->cache_idx]) {
- if ((obact) && (obact == ob) && (gpd->flag & (GP_DATA_STROKE_SHOW_EDIT_LINES | GP_DATA_STROKE_MULTIEDIT_LINES))) {
+ if ((obact) && (obact == ob) && (gpd->flag & GP_DATA_STROKE_SHOW_EDIT_LINES)) {
DRW_shgroup_call_add(stl->g_data->shgrps_edit_line, cache->batch_edlin[cache->cache_idx], gpf->viewmatrix);
}
}
More information about the Bf-blender-cvs
mailing list