From 34daf527f3a0f6b64f8f11972088b4567e937699 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 5 Mar 2019 15:09:25 +1100 Subject: Cleanup: rename RENDER_OVERRIDE -> HIDE_OVERLAYS Match the UI naming (changed since 2.7x). --- source/blender/editors/gpencil/annotate_draw.c | 2 +- source/blender/editors/gpencil/drawgpencil.c | 4 ++-- source/blender/editors/mesh/editmesh_polybuild.c | 2 +- source/blender/editors/object/object_transform.c | 2 +- source/blender/editors/space_view3d/space_view3d.c | 2 +- source/blender/editors/space_view3d/view3d_draw.c | 8 ++++---- source/blender/editors/space_view3d/view3d_draw_legacy.c | 2 +- source/blender/editors/space_view3d/view3d_gizmo_armature.c | 2 +- source/blender/editors/space_view3d/view3d_gizmo_camera.c | 4 ++-- source/blender/editors/space_view3d/view3d_gizmo_empty.c | 2 +- source/blender/editors/space_view3d/view3d_gizmo_forcefield.c | 2 +- source/blender/editors/space_view3d/view3d_gizmo_light.c | 6 +++--- source/blender/editors/space_view3d/view3d_gizmo_navigate.c | 2 +- source/blender/editors/space_view3d/view3d_gizmo_ruler.c | 4 ++-- source/blender/editors/transform/transform.c | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/gpencil/annotate_draw.c b/source/blender/editors/gpencil/annotate_draw.c index 29d5aa6df4d..f30b3a45971 100644 --- a/source/blender/editors/gpencil/annotate_draw.c +++ b/source/blender/editors/gpencil/annotate_draw.c @@ -1124,7 +1124,7 @@ void ED_gpencil_draw_view3d_annotations( dflag |= (GP_DRAWDATA_ONLY3D | GP_DRAWDATA_NOSTATUS); } - if (v3d->flag2 & V3D_RENDER_OVERRIDE) { + if (v3d->flag2 & V3D_HIDE_OVERLAYS) { /* don't draw status text when "only render" flag is set */ dflag |= GP_DRAWDATA_NOSTATUS; } diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index b36929f66b0..37927aba0c5 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -1668,7 +1668,7 @@ void ED_gpencil_draw_view3d( dflag |= (GP_DRAWDATA_ONLY3D | GP_DRAWDATA_NOSTATUS); } - if (v3d->flag2 & V3D_RENDER_OVERRIDE) { + if (v3d->flag2 & V3D_HIDE_OVERLAYS) { /* don't draw status text when "only render" flag is set */ dflag |= GP_DRAWDATA_NOSTATUS; } @@ -1724,7 +1724,7 @@ void ED_gpencil_draw_view3d_object(wmWindowManager *wm, Scene *scene, Depsgraph dflag |= (GP_DRAWDATA_ONLY3D | GP_DRAWDATA_NOSTATUS); } - if (v3d->flag2 & V3D_RENDER_OVERRIDE) { + if (v3d->flag2 & V3D_HIDE_OVERLAYS) { /* don't draw status text when "only render" flag is set */ dflag |= GP_DRAWDATA_NOSTATUS; } diff --git a/source/blender/editors/mesh/editmesh_polybuild.c b/source/blender/editors/mesh/editmesh_polybuild.c index c94cc525e48..19831e8f380 100644 --- a/source/blender/editors/mesh/editmesh_polybuild.c +++ b/source/blender/editors/mesh/editmesh_polybuild.c @@ -92,7 +92,7 @@ static bool edbm_preselect_or_active( { ARegion *ar = CTX_wm_region(C); const bool show_gizmo = !( - (v3d->flag2 & V3D_RENDER_OVERRIDE) || + (v3d->flag2 & V3D_HIDE_OVERLAYS) || (v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_TOOL))); wmGizmoMap *gzmap = show_gizmo ? ar->gizmo_map : NULL; diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index ea51fdb5c86..534889ffa45 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -1468,7 +1468,7 @@ static int object_transform_axis_target_invoke(bContext *C, wmOperator *op, cons #ifdef USE_RENDER_OVERRIDE int flag2_prev = vc.v3d->flag2; - vc.v3d->flag2 |= V3D_RENDER_OVERRIDE; + vc.v3d->flag2 |= V3D_HIDE_OVERLAYS; #endif ED_view3d_autodist_init(vc.depsgraph, vc.ar, vc.v3d, 0); diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 6475de521d9..ca18a96c253 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -1322,7 +1322,7 @@ static void space_view3d_listener( case NC_SCENE: switch (wmn->data) { case ND_WORLD: - if (v3d->flag2 & V3D_RENDER_OVERRIDE) + if (v3d->flag2 & V3D_HIDE_OVERLAYS) ED_area_tag_redraw_regiontype(sa, RGN_TYPE_WINDOW); break; } diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index aca2cf53aa6..5e59c36a80f 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -509,7 +509,7 @@ static void drawviewborder(Scene *scene, Depsgraph *depsgraph, ARegion *ar, View } /* When overlays are disabled, only show camera outline & passepartout. */ - if (v3d->flag2 & V3D_RENDER_OVERRIDE) { + if (v3d->flag2 & V3D_HIDE_OVERLAYS) { return; } @@ -1273,7 +1273,7 @@ void view3d_draw_region_info(const bContext *C, ARegion *ar) BLF_batch_draw_begin(); if ((U.uiflag & USER_SHOW_GIZMO_AXIS) || - (v3d->flag2 & V3D_RENDER_OVERRIDE) || + (v3d->flag2 & V3D_HIDE_OVERLAYS) || /* No need to display gizmo and this info. */ (v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_NAVIGATE))) { @@ -1286,7 +1286,7 @@ void view3d_draw_region_info(const bContext *C, ARegion *ar) int xoffset = rect.xmin + U.widget_unit; int yoffset = rect.ymax; - if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0 && + if ((v3d->flag2 & V3D_HIDE_OVERLAYS) == 0 && (v3d->overlay.flag & V3D_OVERLAY_HIDE_TEXT) == 0) { if ((U.uiflag & USER_SHOW_FPS) && ED_screen_animation_no_scrub(wm)) { @@ -1671,7 +1671,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple( v3d.camera = camera; v3d.shading.type = drawtype; - v3d.flag2 = V3D_RENDER_OVERRIDE; + v3d.flag2 = V3D_HIDE_OVERLAYS; if (draw_flags & V3D_OFSDRAW_USE_GPENCIL) { v3d.flag2 |= V3D_SHOW_ANNOTATION; diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c index d7d0e4660f7..0afdd36dbb6 100644 --- a/source/blender/editors/space_view3d/view3d_draw_legacy.c +++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c @@ -734,7 +734,7 @@ void ED_view3d_draw_bgpic_test( /* disabled - mango request, since footage /w only render is quite useful * and this option is easy to disable all background images at once */ #if 0 - if (v3d->flag2 & V3D_RENDER_OVERRIDE) + if (v3d->flag2 & V3D_HIDE_OVERLAYS) return; #endif diff --git a/source/blender/editors/space_view3d/view3d_gizmo_armature.c b/source/blender/editors/space_view3d/view3d_gizmo_armature.c index 8f268a40817..47f9cc580ea 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_armature.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_armature.c @@ -125,7 +125,7 @@ static void gizmo_bbone_offset_set( static bool WIDGETGROUP_armature_spline_poll(const bContext *C, wmGizmoGroupType *UNUSED(gzgt)) { View3D *v3d = CTX_wm_view3d(C); - if ((v3d->flag2 & V3D_RENDER_OVERRIDE) || + if ((v3d->flag2 & V3D_HIDE_OVERLAYS) || (v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_CONTEXT))) { return false; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.c b/source/blender/editors/space_view3d/view3d_gizmo_camera.c index 2d871e8d646..a3859a8468e 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_camera.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.c @@ -61,7 +61,7 @@ struct CameraWidgetGroup { static bool WIDGETGROUP_camera_poll(const bContext *C, wmGizmoGroupType *UNUSED(gzgt)) { View3D *v3d = CTX_wm_view3d(C); - if ((v3d->flag2 & V3D_RENDER_OVERRIDE) || + if ((v3d->flag2 & V3D_HIDE_OVERLAYS) || (v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_CONTEXT))) { return false; @@ -369,7 +369,7 @@ static bool WIDGETGROUP_camera_view_poll(const bContext *C, wmGizmoGroupType *UN } View3D *v3d = CTX_wm_view3d(C); - if ((v3d->flag2 & V3D_RENDER_OVERRIDE) || + if ((v3d->flag2 & V3D_HIDE_OVERLAYS) || (v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_CONTEXT))) { return false; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_empty.c b/source/blender/editors/space_view3d/view3d_gizmo_empty.c index 708d91fc823..ee6dd2b8267 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_empty.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_empty.c @@ -106,7 +106,7 @@ static bool WIDGETGROUP_empty_image_poll(const bContext *C, wmGizmoGroupType *UN View3D *v3d = CTX_wm_view3d(C); RegionView3D *rv3d = CTX_wm_region_view3d(C); - if ((v3d->flag2 & V3D_RENDER_OVERRIDE) || + if ((v3d->flag2 & V3D_HIDE_OVERLAYS) || (v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_CONTEXT))) { return false; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c index b39cc5086bb..750a8101a15 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c @@ -49,7 +49,7 @@ static bool WIDGETGROUP_forcefield_poll(const bContext *C, wmGizmoGroupType *UNU { View3D *v3d = CTX_wm_view3d(C); - if ((v3d->flag2 & V3D_RENDER_OVERRIDE) || + if ((v3d->flag2 & V3D_HIDE_OVERLAYS) || (v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_CONTEXT))) { return false; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_light.c b/source/blender/editors/space_view3d/view3d_gizmo_light.c index 4680fadcb7f..90f1b60e21a 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_light.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_light.c @@ -51,7 +51,7 @@ static bool WIDGETGROUP_light_spot_poll(const bContext *C, wmGizmoGroupType *UNUSED(gzgt)) { View3D *v3d = CTX_wm_view3d(C); - if ((v3d->flag2 & V3D_RENDER_OVERRIDE) || + if ((v3d->flag2 & V3D_HIDE_OVERLAYS) || (v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_CONTEXT))) { return false; @@ -161,7 +161,7 @@ static void gizmo_area_light_prop_matrix_set( static bool WIDGETGROUP_light_area_poll(const bContext *C, wmGizmoGroupType *UNUSED(gzgt)) { View3D *v3d = CTX_wm_view3d(C); - if (v3d->flag2 & V3D_RENDER_OVERRIDE) { + if (v3d->flag2 & V3D_HIDE_OVERLAYS) { return false; } @@ -244,7 +244,7 @@ void VIEW3D_GGT_light_area(wmGizmoGroupType *gzgt) static bool WIDGETGROUP_light_target_poll(const bContext *C, wmGizmoGroupType *UNUSED(gzgt)) { View3D *v3d = CTX_wm_view3d(C); - if (v3d->flag2 & V3D_RENDER_OVERRIDE) { + if (v3d->flag2 & V3D_HIDE_OVERLAYS) { return false; } diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c index 037c0e53247..acf6aa7e188 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c @@ -121,7 +121,7 @@ static bool WIDGETGROUP_navigate_poll(const bContext *C, wmGizmoGroupType *UNUSE { View3D *v3d = CTX_wm_view3d(C); if (((U.uiflag & USER_SHOW_GIZMO_AXIS) == 0) || - (v3d->flag2 & V3D_RENDER_OVERRIDE) || + (v3d->flag2 & V3D_HIDE_OVERLAYS) || (v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_NAVIGATE))) { return false; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c index 6e26f9a2c13..09757e13297 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c @@ -1042,7 +1042,7 @@ static int view3d_ruler_add_invoke(bContext *C, wmOperator *op, const wmEvent *e View3D *v3d = CTX_wm_view3d(C); RegionView3D *rv3d = ar->regiondata; - if ((v3d->flag2 & V3D_RENDER_OVERRIDE) || + if ((v3d->flag2 & V3D_HIDE_OVERLAYS) || (v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_TOOL))) { BKE_report(op->reports, RPT_WARNING, "Gizmos hidden in this view"); @@ -1107,7 +1107,7 @@ static int view3d_ruler_remove_invoke(bContext *C, wmOperator *op, const wmEvent ARegion *ar = CTX_wm_region(C); View3D *v3d = CTX_wm_view3d(C); - if ((v3d->flag2 & V3D_RENDER_OVERRIDE) || + if ((v3d->flag2 & V3D_HIDE_OVERLAYS) || (v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_TOOL))) { BKE_report(op->reports, RPT_WARNING, "Gizmos hidden in this view"); diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 6f979460f8b..5b26066afe0 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1946,7 +1946,7 @@ static bool transinfo_show_overlay(const struct bContext *C, TransInfo *t, ARegi ScrArea *sa = CTX_wm_area(C); if (sa->spacetype == SPACE_VIEW3D) { View3D *v3d = sa->spacedata.first; - if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) { + if ((v3d->flag2 & V3D_HIDE_OVERLAYS) == 0) { ok = true; } } -- cgit v1.2.3