[Bf-blender-cvs] [d8ff7b2d15f] greasepencil-object: Disable points if disable_fill is enabled

Antonio Vazquez noreply at git.blender.org
Tue Jan 9 08:59:52 CET 2018


Commit: d8ff7b2d15fad852a074d42e1fdcbdebe4e12f5e
Author: Antonio Vazquez
Date:   Tue Jan 9 08:59:41 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd8ff7b2d15fad852a074d42e1fdcbdebe4e12f5e

Disable points if disable_fill is enabled

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

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

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

diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index a3f2c2d798e..83166a19768 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -1098,14 +1098,18 @@ static void gp_draw_strokes(tGPDdraw *tgpw)
 			}
 			if (palcolor->flag & PAC_COLOR_DOT) {
 				/* volumetric stroke drawing */
-				gp_draw_stroke_volumetric_3d(gps->points, gps->totpoints, sthickness, ink);
+				if (tgpw->disable_fill != 1) {
+					gp_draw_stroke_volumetric_3d(gps->points, gps->totpoints, sthickness, ink);
+				}
 			}
 			else {
 				/* 3D Lines - OpenGL primitives-based */
 				if (gps->totpoints == 1) {
-					gp_draw_stroke_point(gps->points, sthickness, tgpw->dflag, gps->flag, 
-										tgpw->offsx, tgpw->offsy, tgpw->winx, tgpw->winy,
-										tgpw->diff_mat, ink);
+					if (tgpw->disable_fill != 1) {
+						gp_draw_stroke_point(gps->points, sthickness, tgpw->dflag, gps->flag,
+							tgpw->offsx, tgpw->offsy, tgpw->winx, tgpw->winy,
+							tgpw->diff_mat, ink);
+					}
 				}
 				else {
 					tgpw->gps = gps;



More information about the Bf-blender-cvs mailing list