[Bf-blender-cvs] [e4e3f9a2441] greasepencil-object: Fill stroke boundary must be included in strokes draw

Antonio Vazquez noreply at git.blender.org
Fri Jan 19 16:53:13 CET 2018


Commit: e4e3f9a2441111920943e1ffdb6232179febcb0a
Author: Antonio Vazquez
Date:   Fri Jan 19 16:52:53 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe4e3f9a2441111920943e1ffdb6232179febcb0a

Fill stroke boundary must be included in strokes draw

If the option of boundary is Strokes, the special boundary strokes must be included as limits.

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

M	source/blender/editors/gpencil/drawgpencil.c

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

diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 53aef5d60f7..6a0650dc743 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -1029,8 +1029,11 @@ static void gp_draw_strokes(tGPDdraw *tgpw)
 			continue;
 		}
 
-		/* if disable fill, the colors with fill must be omitted too */
-		if ((tgpw->disable_fill == 1) && (palcolor->fill[3] > 0.0f)) {
+		/* if disable fill, the colors with fill must be omitted too except fill boundary strokes */
+		if ((tgpw->disable_fill == 1) && 
+			(palcolor->fill[3] > 0.0f) && 
+			((gps->flag & GP_STROKE_NOFILL) == 0))
+		{
 				continue;
 		}



More information about the Bf-blender-cvs mailing list