[Bf-blender-cvs] [38b6e10780d] greasepencil-object: Disable onion skinning in edit modes

Antonio Vazquez noreply at git.blender.org
Wed Aug 23 16:46:41 CEST 2017


Commit: 38b6e10780d2a5fbe4ce5e66748b4e893a8a793c
Author: Antonio Vazquez
Date:   Wed Aug 23 16:46:27 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB38b6e10780d2a5fbe4ce5e66748b4e893a8a793c

Disable onion skinning in edit modes

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

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 c21f215f709..7fab3c5a347 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -973,7 +973,7 @@ void DRW_gpencil_populate_datablock(GPENCIL_e_data *e_data, void *vedata, Scene
 			BLI_ghash_insert(gpl->derived_data, ob->id.name, derived_gpf);
 		}
 		/* draw onion skins */
-		if ((gpl->flag & GP_LAYER_ONIONSKIN) &&
+		if ((!is_edit) && (gpl->flag & GP_LAYER_ONIONSKIN) &&
 			((!playing) || (gpl->flag & GP_LAYER_GHOST_ALWAYS)))
 		{
 			gpencil_draw_onionskins(cache, e_data, vedata, ts, ob, gpd, gpl, gpf);



More information about the Bf-blender-cvs mailing list