Commit: c2a12eedd15b0cc152e3097e24c11597c167550c
Author: Antonioya
Date:   Sat Nov 3 09:58:38 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBc2a12eedd15b0cc152e3097e24c11597c167550c

GP: Use stroke and fill switches while drawing

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

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

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c 
b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 6d60bd41562..b12f6d2229b 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -974,15 +974,18 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data 
*e_data, void *vedata, T
                                                gpd, lthick);
                                }
 
-                               DRW_shgroup_call_add(
-                                       stl->g_data->shgrps_drawing_stroke,
-                                       e_data->batch_buffer_stroke,
-                                       stl->storage->unit_matrix);
+                               if (gp_style->flag & GP_STYLE_STROKE_SHOW) {
+                                       DRW_shgroup_call_add(
+                                               
stl->g_data->shgrps_drawing_stroke,
+                                               e_data->batch_buffer_stroke,
+                                               stl->storage->unit_matrix);
+                               }
 
                                if ((gpd->runtime.sbuffer_size >= 3) &&
                                    (gpd->runtime.sfill[3] > 
GPENCIL_ALPHA_OPACITY_THRESH) &&
                                    ((gpd->runtime.sbuffer_sflag & 
GP_STROKE_NOFILL) == 0) &&
-                                   ((brush->gpencil_settings->flag & 
GP_BRUSH_DISSABLE_LASSO) == 0))
+                                   ((brush->gpencil_settings->flag & 
GP_BRUSH_DISSABLE_LASSO) == 0) &&
+                                       (gp_style->flag & GP_STYLE_FILL_SHOW))
                                {
                                        /* if not solid, fill is simulated with 
solid color */
                                        if (gpd->runtime.bfill_style > 0) {

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to