[Bf-blender-cvs] [55f01739c4a] greasepencil-object: Undo hide Onion with overlay
Antonio Vazquez
noreply at git.blender.org
Fri Jul 6 20:54:57 CEST 2018
Commit: 55f01739c4a31bcf1a3331c1793a0ee83b4ab408
Author: Antonio Vazquez
Date: Fri Jul 6 20:54:48 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB55f01739c4a31bcf1a3331c1793a0ee83b4ab408
Undo hide Onion with overlay
There is a problem with the cache update and need a refactor. Remove the code while found a solution.
===================================================================
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 ec318356628..a03bdb26634 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1219,12 +1219,12 @@ void DRW_gpencil_populate_datablock(GPENCIL_e_data *e_data, void *vedata, Scene
/* draw onion skins */
if ((gpd->flag & GP_DATA_SHOW_ONIONSKINS) && (!no_onion) &&
- (gpl->onion_flag & GP_LAYER_ONIONSKIN) &&
- ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) &&
- ((!playing) || (gpd->onion_flag & GP_ONION_GHOST_ALWAYS)))
+ (gpl->onion_flag & GP_LAYER_ONIONSKIN) &&
+ ((!playing) || (gpd->onion_flag & GP_ONION_GHOST_ALWAYS)))
{
if ((!stl->storage->is_render) ||
- ((stl->storage->is_render) && (gpd->onion_flag & GP_ONION_GHOST_ALWAYS))) {
+ ((stl->storage->is_render) && (gpd->onion_flag & GP_ONION_GHOST_ALWAYS)))
+ {
gpencil_draw_onionskins(cache, e_data, vedata, ob, gpd, gpl, gpf);
}
}
More information about the Bf-blender-cvs
mailing list