From afcbf7cf1357723f59eca8e118a0ca9ef6cf6555 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 2 Feb 2019 13:39:51 +1100 Subject: Cleanup: use G_FLAG_*/G_FILE_* for G.f/fileflags Was confusing eg: G_AUTOPACK belonged to G.fileflags, G_PICKSEL to G.f. --- source/blender/editors/gpencil/annotate_draw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/gpencil/annotate_draw.c') diff --git a/source/blender/editors/gpencil/annotate_draw.c b/source/blender/editors/gpencil/annotate_draw.c index ea8f2731bb8..d4f328a0071 100644 --- a/source/blender/editors/gpencil/annotate_draw.c +++ b/source/blender/editors/gpencil/annotate_draw.c @@ -848,7 +848,7 @@ static void gp_draw_data_layers( * (NOTE: doing it this way means that the toggling editmode shows visible change immediately) */ /* XXX: perhaps we don't want to show these when users are drawing... */ - if ((G.f & G_RENDER_OGL) == 0 && + if ((G.f & G_FLAG_RENDER_VIEWPORT) == 0 && (gpl->flag & GP_LAYER_LOCKED) == 0 && (gpd->flag & GP_DATA_STROKE_EDITMODE)) { @@ -881,7 +881,7 @@ static void gp_draw_status_text(const bGPdata *gpd, ARegion *ar) rcti rect; /* Cannot draw any status text when drawing OpenGL Renders */ - if (G.f & G_RENDER_OGL) + if (G.f & G_FLAG_RENDER_VIEWPORT) return; /* Get bounds of region - Necessary to avoid problems with region overlap */ @@ -1099,7 +1099,7 @@ void ED_gpencil_draw_view3d_annotations( /* when rendering to the offscreen buffer we don't want to * deal with the camera border, otherwise map the coords to the camera border. */ - if ((rv3d->persp == RV3D_CAMOB) && !(G.f & G_RENDER_OGL)) { + if ((rv3d->persp == RV3D_CAMOB) && !(G.f & G_FLAG_RENDER_VIEWPORT)) { rctf rectf; ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &rectf, true); /* no shift */ -- cgit v1.2.3