diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-02 05:39:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-02 05:49:13 +0300 |
| commit | afcbf7cf1357723f59eca8e118a0ca9ef6cf6555 (patch) | |
| tree | 95c520cd1e556f3cf1fa0a799bc23efe649cf22c /source/blender/editors/space_view3d | |
| parent | a53011d52012067ad1334d654a68c97327005626 (diff) | |
Cleanup: use G_FLAG_*/G_FILE_* for G.f/fileflags
Was confusing eg: G_AUTOPACK belonged to G.fileflags, G_PICKSEL to G.f.
Diffstat (limited to 'source/blender/editors/space_view3d')
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 25524ec62dc..79c4705c915 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -64,7 +64,7 @@ static bool check_ob_drawface_dot(Scene *sce, View3D *vd, char dt) if ((sce->toolsettings->selectmode & SCE_SELECT_FACE) == 0) return false; - if (G.f & G_BACKBUFSEL) + if (G.f & G_FLAG_BACKBUFSEL) return false; /* if its drawing textures with zbuf sel, then don't draw dots */ diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 33611db0c4e..1bcac0d1068 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1420,7 +1420,7 @@ void ED_view3d_draw_offscreen( UI_SetTheme(SPACE_VIEW3D, RGN_TYPE_WINDOW); /* set flags */ - G.f |= G_RENDER_OGL; + G.f |= G_FLAG_RENDER_VIEWPORT; { /* free images which can have changed on frame-change @@ -1453,7 +1453,7 @@ void ED_view3d_draw_offscreen( UI_Theme_Restore(&theme_state); - G.f &= ~G_RENDER_OGL; + G.f &= ~G_FLAG_RENDER_VIEWPORT; } /** diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c index 5213307db3a..7a358c46f75 100644 --- a/source/blender/editors/space_view3d/view3d_draw_legacy.c +++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c @@ -229,7 +229,7 @@ static void backdrawview3d( if (rv3d->rflag & RV3D_CLIPPING) ED_view3d_clipping_set(rv3d); - G.f |= G_BACKBUFSEL; + G.f |= G_FLAG_BACKBUFSEL; if (obact_eval && ((obact_eval->base_flag & BASE_VISIBLE) != 0)) { draw_object_backbufsel(depsgraph, scene_eval, v3d, rv3d, obact_eval, select_mode); @@ -240,7 +240,7 @@ static void backdrawview3d( v3d->flag &= ~V3D_INVALID_BACKBUF; - G.f &= ~G_BACKBUFSEL; + G.f &= ~G_FLAG_BACKBUFSEL; GPU_depth_test(false); glEnable(GL_DITHER); diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index bc8377896a9..0dead55ca46 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1024,7 +1024,7 @@ int view3d_opengl_select( /* All of the queries need to be perform on the drawing context. */ DRW_opengl_context_enable(); - G.f |= G_PICKSEL; + G.f |= G_FLAG_PICKSEL; /* Important we use the 'viewmat' and don't re-calculate since * the object & bone view locking takes 'rect' into account, see: T51629. */ @@ -1082,7 +1082,7 @@ int view3d_opengl_select( hits = drw_select_loop_user_data.hits; } - G.f &= ~G_PICKSEL; + G.f &= ~G_FLAG_PICKSEL; ED_view3d_draw_setup_view(vc->win, depsgraph, scene, ar, v3d, vc->rv3d->viewmat, NULL, NULL); if (v3d->shading.type > OB_WIRE) { |