diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-01 01:42:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-01 01:42:00 +0300 |
| commit | 29937dce8f518b09838f58abcc42a43fb29bf64f (patch) | |
| tree | 256469286467ecf55abbea85a7a5a10035da3108 /source/blender/draw/engines/gpencil/gpencil_engine.c | |
| parent | 7b72be0134887622518f1fb6d6009fa67bf41593 (diff) | |
| parent | e8d58080df07d4b7d9372bfca0dd54ea2817394a (diff) | |
Merge branch 'master' into blender2.8
Move 'View3D.flag3' options into 'gp_flag'.
Diffstat (limited to 'source/blender/draw/engines/gpencil/gpencil_engine.c')
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_engine.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index 0c76971ac4b..8b8da3f2065 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -510,7 +510,7 @@ void GPENCIL_cache_populate(void *vedata, Object *ob) /* grid */ if ((v3d) && ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) && - (v3d->flag3 & V3D_GP_SHOW_GRID) && + (v3d->gp_flag & V3D_GP_SHOW_GRID) && (ob->type == OB_GPENCIL) && (ob == draw_ctx->obact)) { stl->g_data->batch_grid = DRW_gpencil_get_grid(); @@ -640,7 +640,7 @@ void GPENCIL_draw_scene(void *ved) /* paper pass to display a confortable area to draw over complex scenes with geometry */ if ((!is_render) && (obact) && (obact->type == OB_GPENCIL)) { if (((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) && - (v3d->flag3 & V3D_GP_SHOW_PAPER) && + (v3d->gp_flag & V3D_GP_SHOW_PAPER) && (stl->g_data->gp_cache_used > 0)) { DRW_draw_pass(psl->paper_pass); @@ -664,7 +664,7 @@ void GPENCIL_draw_scene(void *ved) /* grid pass */ if ((!is_render) && (obact) && (obact->type == OB_GPENCIL)) { if (((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) && - (v3d->flag3 & V3D_GP_SHOW_GRID)) + (v3d->gp_flag & V3D_GP_SHOW_GRID)) { DRW_draw_pass(psl->grid_pass); } @@ -753,7 +753,7 @@ void GPENCIL_draw_scene(void *ved) /* grid pass */ if ((!is_render) && (obact) && (obact->type == OB_GPENCIL)) { if (((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) && - (v3d->flag3 & V3D_GP_SHOW_GRID)) + (v3d->gp_flag & V3D_GP_SHOW_GRID)) { DRW_draw_pass(psl->grid_pass); } |