[Bf-blender-cvs] [0c11d68b224] greasepencil-object: if disable fill, the colors with fill must be omitted

[Antonio Vazquez]

Commit: 0c11d68b224151d9d393ce69f3df5d2e93c989ea
Author: Antonio Vazquez
Date:   Mon Jan 8 17:28:19 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB0c11d68b224151d9d393ce69f3df5d2e93c989ea

if disable fill, the colors with fill must be omitted

This is done to avoid double borders when fill a previous filled area.

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

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

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

diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 9c2525c68ab..a3f2c2d798e 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -1029,6 +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)) {
+				continue;
+		}
+
 		/* calculate thickness */
 		sthickness = gps->thickness + tgpw->lthick;