[Bf-blender-cvs] [ed5c6da73c7] greasepencil-object: Disable Grease Pencil Paper when disable overlays

Antonio Vazquez noreply at git.blender.org
Fri Jul 6 15:57:17 CEST 2018


Commit: ed5c6da73c7a832c2e099961bc35a4d6b21dc871
Author: Antonio Vazquez
Date:   Fri Jul 6 15:57:09 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBed5c6da73c7a832c2e099961bc35a4d6b21dc871

Disable Grease Pencil Paper when disable overlays

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

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

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 1baaea96896..91ab6b2ad3b 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -604,7 +604,10 @@ void GPENCIL_draw_scene(void *ved)
 
 	/* paper pass to display a confortable area to draw over complex scenes with geometry */
 	if ((!is_render) && (obact) && (obact->type == OB_GPENCIL)) {
-		if ((v3d->flag3 & V3D_GP_SHOW_PAPER) && (stl->g_data->gp_cache_used > 0)) {
+		if (((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) &&
+			(v3d->flag3 & V3D_GP_SHOW_PAPER) &&
+			(stl->g_data->gp_cache_used > 0))
+		{
 			DRW_draw_pass(psl->paper_pass);
 		}
 	}



More information about the Bf-blender-cvs mailing list