diff options
| author | Antonioya <blendergit@gmail.com> | 2019-07-23 10:46:29 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-07-23 10:46:29 +0300 |
| commit | 2204bfcf9e1c3a38e60830bd97775dd72158f4d6 (patch) | |
| tree | 4f9c827389a23a431f8771b4ca02f410860c0242 /source/blender/draw/engines/gpencil/gpencil_draw_utils.c | |
| parent | f64db794ee690f05905ace0a66d81d2e75549b90 (diff) | |
| parent | 34ad6da4a06ef46cd19945f61cc5f968538546a8 (diff) | |
Merge branch 'master' into temp-gpencil-drw-engine
Diffstat (limited to 'source/blender/draw/engines/gpencil/gpencil_draw_utils.c')
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_draw_utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c index 97d2d3393a9..181d2efbabb 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c @@ -57,7 +57,7 @@ #define SOLID 0 #define GRADIENT 1 #define RADIAL 2 -#define CHESS 3 +#define CHECKER 3 #define TEXTURE 4 #define PATTERN 5 @@ -240,7 +240,7 @@ static void gpencil_recalc_geometry_caches(Object *ob, if (gps->flag & GP_STROKE_RECALC_GEOMETRY) { /* Calculate triangles cache for filling area (must be done only after changes) */ if ((gps->tot_triangles == 0) || (gps->triangles == NULL)) { - if ((gps->totpoints > 2) && + if ((gps->totpoints > 2) && (gp_style->flag & GP_STYLE_FILL_SHOW) && ((gp_style->fill_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH) || (gp_style->fill_style > 0) || (gpl->blend_mode != eGplBlendMode_Regular))) { gpencil_triangulate_stroke_fill(ob, gps); @@ -387,8 +387,8 @@ static DRWShadingGroup *gpencil_shgroup_fill_create(GPENCIL_Data *vedata, stl->shgroups[id].fill_style = RADIAL; } break; - case GP_STYLE_FILL_STYLE_CHESSBOARD: - stl->shgroups[id].fill_style = CHESS; + case GP_STYLE_FILL_STYLE_CHECKER: + stl->shgroups[id].fill_style = CHECKER; break; case GP_STYLE_FILL_STYLE_TEXTURE: if (gp_style->flag & GP_STYLE_FILL_PATTERN) { |