From 905c0269f302e8e0e7a27dda8d5256fdcd06ce60 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Fri, 3 Apr 2020 13:25:03 +0200 Subject: Cleanup: Rename ScrArea variables from sa to area Follow up of b2ee1770d4c3 and 10c2254d412d, part of T74432. Now the area and region naming conventions should be less confusing. Mostly a careful batch rename but had to do few smaller fixes. Also ran clang-format on affected files. --- source/blender/makesrna/intern/rna_material.c | 6 +- source/blender/makesrna/intern/rna_object_api.c | 6 +- source/blender/makesrna/intern/rna_screen.c | 58 +++++----- source/blender/makesrna/intern/rna_sculpt_paint.c | 6 +- source/blender/makesrna/intern/rna_space.c | 126 +++++++++++----------- source/blender/makesrna/intern/rna_space_api.c | 14 +-- source/blender/makesrna/intern/rna_ui.c | 7 +- source/blender/makesrna/intern/rna_wm_gizmo.c | 4 +- 8 files changed, 114 insertions(+), 113 deletions(-) (limited to 'source/blender/makesrna') diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 127341e6801..3464f6d7179 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -169,10 +169,10 @@ static void rna_Material_active_paint_texture_index_update(Main *bmain, obedit = OBEDIT_FROM_VIEW_LAYER(view_layer); } - ScrArea *sa; - for (sa = sc->areabase.first; sa; sa = sa->next) { + ScrArea *area; + for (area = sc->areabase.first; area; area = area->next) { SpaceLink *sl; - for (sl = sa->spacedata.first; sl; sl = sl->next) { + for (sl = area->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_IMAGE) { SpaceImage *sima = (SpaceImage *)sl; if (!sima->pin) { diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index f4b64d2f812..194f5418e75 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -276,9 +276,9 @@ static void rna_Object_local_view_set(Object *ob, SET_FLAG_FROM_TEST(base->local_view_bits, state, v3d->local_view_uuid); if (local_view_bits_prev != base->local_view_bits) { DEG_id_tag_update(&scene->id, ID_RECALC_BASE_FLAGS); - ScrArea *sa = ED_screen_area_find_with_spacedata(sc, (SpaceLink *)v3d, true); - if (sa) { - ED_area_tag_redraw(sa); + ScrArea *area = ED_screen_area_find_with_spacedata(sc, (SpaceLink *)v3d, true); + if (area) { + ED_area_tag_redraw(area); } } } diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c index c6245f51e15..290404291ae 100644 --- a/source/blender/makesrna/intern/rna_screen.c +++ b/source/blender/makesrna/intern/rna_screen.c @@ -116,10 +116,10 @@ static const EnumPropertyItem *rna_Area_type_itemf(bContext *UNUSED(C), static int rna_Area_type_get(PointerRNA *ptr) { - ScrArea *sa = (ScrArea *)ptr->data; + ScrArea *area = (ScrArea *)ptr->data; /* Usually 'spacetype' is used. It lags behind a bit while switching area * type though, then we use 'butspacetype' instead (T41435). */ - return (sa->butspacetype == SPACE_EMPTY) ? sa->spacetype : sa->butspacetype; + return (area->butspacetype == SPACE_EMPTY) ? area->spacetype : area->butspacetype; } static void rna_Area_type_set(PointerRNA *ptr, int value) @@ -131,17 +131,17 @@ static void rna_Area_type_set(PointerRNA *ptr, int value) return; } - ScrArea *sa = (ScrArea *)ptr->data; - sa->butspacetype = value; + ScrArea *area = (ScrArea *)ptr->data; + area->butspacetype = value; } static void rna_Area_type_update(bContext *C, PointerRNA *ptr) { bScreen *sc = (bScreen *)ptr->owner_id; - ScrArea *sa = (ScrArea *)ptr->data; + ScrArea *area = (ScrArea *)ptr->data; /* Running update without having called 'set', see: T64049 */ - if (sa->butspacetype == SPACE_EMPTY) { + if (area->butspacetype == SPACE_EMPTY) { return; } @@ -155,17 +155,17 @@ static void rna_Area_type_update(bContext *C, PointerRNA *ptr) ARegion *prevar = CTX_wm_region(C); CTX_wm_window_set(C, win); - CTX_wm_area_set(C, sa); + CTX_wm_area_set(C, area); CTX_wm_region_set(C, NULL); - ED_area_newspace(C, sa, sa->butspacetype, true); - ED_area_tag_redraw(sa); + ED_area_newspace(C, area, area->butspacetype, true); + ED_area_tag_redraw(area); /* Unset so that rna_Area_type_get uses spacetype instead. */ - sa->butspacetype = SPACE_EMPTY; + area->butspacetype = SPACE_EMPTY; /* It is possible that new layers becomes visible. */ - if (sa->spacetype == SPACE_VIEW3D) { + if (area->spacetype == SPACE_VIEW3D) { DEG_on_visible_update(CTX_data_main(C), false); } @@ -213,51 +213,51 @@ static const EnumPropertyItem *rna_Area_ui_type_itemf(bContext *C, static int rna_Area_ui_type_get(PointerRNA *ptr) { - ScrArea *sa = ptr->data; + ScrArea *area = ptr->data; const int area_type = rna_Area_type_get(ptr); - const bool area_changing = sa->butspacetype != SPACE_EMPTY; + const bool area_changing = area->butspacetype != SPACE_EMPTY; int value = area_type << 16; - /* sa->type can be NULL (when not yet initialized), try to do it now. */ + /* area->type can be NULL (when not yet initialized), try to do it now. */ /* Copied from `ED_area_initialize()`.*/ - if (sa->type == NULL || area_changing) { - sa->type = BKE_spacetype_from_id(area_type); - if (sa->type == NULL) { - sa->spacetype = SPACE_VIEW3D; - sa->type = BKE_spacetype_from_id(sa->spacetype); + if (area->type == NULL || area_changing) { + area->type = BKE_spacetype_from_id(area_type); + if (area->type == NULL) { + area->spacetype = SPACE_VIEW3D; + area->type = BKE_spacetype_from_id(area->spacetype); } - BLI_assert(sa->type != NULL); + BLI_assert(area->type != NULL); } - if (sa->type->space_subtype_item_extend != NULL) { - value |= area_changing ? sa->butspacetype_subtype : sa->type->space_subtype_get(sa); + if (area->type->space_subtype_item_extend != NULL) { + value |= area_changing ? area->butspacetype_subtype : area->type->space_subtype_get(area); } return value; } static void rna_Area_ui_type_set(PointerRNA *ptr, int value) { - ScrArea *sa = ptr->data; + ScrArea *area = ptr->data; const int space_type = value >> 16; SpaceType *st = BKE_spacetype_from_id(space_type); rna_Area_type_set(ptr, space_type); if (st && st->space_subtype_item_extend != NULL) { - sa->butspacetype_subtype = value & 0xffff; + area->butspacetype_subtype = value & 0xffff; } } static void rna_Area_ui_type_update(bContext *C, PointerRNA *ptr) { - ScrArea *sa = ptr->data; - SpaceType *st = BKE_spacetype_from_id(sa->butspacetype); + ScrArea *area = ptr->data; + SpaceType *st = BKE_spacetype_from_id(area->butspacetype); rna_Area_type_update(C, ptr); - if ((sa->type == st) && (st->space_subtype_item_extend != NULL)) { - st->space_subtype_set(sa, sa->butspacetype_subtype); + if ((area->type == st) && (st->space_subtype_item_extend != NULL)) { + st->space_subtype_set(area, area->butspacetype_subtype); } - sa->butspacetype_subtype = 0; + area->butspacetype_subtype = 0; } static void rna_View2D_region_to_view(struct View2D *v2d, float x, float y, float result[2]) diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index f2d5c465dac..345d5ecf007 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -511,10 +511,10 @@ static void rna_ImaPaint_canvas_update(bContext *C, PointerRNA *UNUSED(ptr)) Image *ima = scene->toolsettings->imapaint.canvas; for (sc = bmain->screens.first; sc; sc = sc->id.next) { - ScrArea *sa; - for (sa = sc->areabase.first; sa; sa = sa->next) { + ScrArea *area; + for (area = sc->areabase.first; area; area = area->next) { SpaceLink *slink; - for (slink = sa->spacedata.first; slink; slink = slink->next) { + for (slink = area->spacedata.first; slink; slink = slink->next) { if (slink->spacetype == SPACE_IMAGE) { SpaceImage *sima = (SpaceImage *)slink; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 7bff13bf1a6..da8827ee6bd 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -575,19 +575,19 @@ static ScrArea *rna_area_from_space(PointerRNA *ptr) static void area_region_from_regiondata(bScreen *sc, void *regiondata, - ScrArea **r_sa, + ScrArea **r_area, ARegion **r_region) { - ScrArea *sa; + ScrArea *area; ARegion *region; - *r_sa = NULL; + *r_area = NULL; *r_region = NULL; - for (sa = sc->areabase.first; sa; sa = sa->next) { - for (region = sa->regionbase.first; region; region = region->next) { + for (area = sc->areabase.first; area; area = area->next) { + for (region = area->regionbase.first; region; region = region->next) { if (region->regiondata == regiondata) { - *r_sa = sa; + *r_area = area; *r_region = region; return; } @@ -595,12 +595,12 @@ static void area_region_from_regiondata(bScreen *sc, } } -static void rna_area_region_from_regiondata(PointerRNA *ptr, ScrArea **r_sa, ARegion **r_region) +static void rna_area_region_from_regiondata(PointerRNA *ptr, ScrArea **r_area, ARegion **r_region) { bScreen *sc = (bScreen *)ptr->owner_id; void *regiondata = ptr->data; - area_region_from_regiondata(sc, regiondata, r_sa, r_region); + area_region_from_regiondata(sc, regiondata, r_area, r_region); } /* -------------------------------------------------------------------- */ @@ -611,8 +611,8 @@ static bool rna_Space_bool_from_region_flag_get_by_type(PointerRNA *ptr, const int region_type, const int region_flag) { - ScrArea *sa = rna_area_from_space(ptr); - ARegion *region = BKE_area_find_region_type(sa, region_type); + ScrArea *area = rna_area_from_space(ptr); + ARegion *region = BKE_area_find_region_type(area, region_type); if (region) { return (region->flag & region_flag); } @@ -624,8 +624,8 @@ static void rna_Space_bool_from_region_flag_set_by_type(PointerRNA *ptr, const int region_flag, bool value) { - ScrArea *sa = rna_area_from_space(ptr); - ARegion *region = BKE_area_find_region_type(sa, region_type); + ScrArea *area = rna_area_from_space(ptr); + ARegion *region = BKE_area_find_region_type(area, region_type); if (region && (region->alignment != RGN_ALIGN_NONE)) { SET_FLAG_FROM_TEST(region->flag, value, region_flag); } @@ -637,16 +637,16 @@ static void rna_Space_bool_from_region_flag_update_by_type(bContext *C, const int region_type, const int region_flag) { - ScrArea *sa = rna_area_from_space(ptr); - ARegion *region = BKE_area_find_region_type(sa, region_type); + ScrArea *area = rna_area_from_space(ptr); + ARegion *region = BKE_area_find_region_type(area, region_type); if (region) { if (region_flag == RGN_FLAG_HIDDEN) { /* Only support animation when the area is in the current context. */ - if (region->overlap && (sa == CTX_wm_area(C))) { - ED_region_visibility_change_update_animated(C, sa, region); + if (region->overlap && (area == CTX_wm_area(C))) { + ED_region_visibility_change_update_animated(C, area, region); } else { - ED_region_visibility_change_update(C, sa, region); + ED_region_visibility_change_update(C, area, region); } } else if (region_flag == RGN_FLAG_HIDDEN_BY_USER) { @@ -654,7 +654,7 @@ static void rna_Space_bool_from_region_flag_update_by_type(bContext *C, ED_region_toggle_hidden(C, region); if ((region->flag & RGN_FLAG_HIDDEN_BY_USER) == 0) { - ED_area_type_hud_ensure(C, sa); + ED_area_type_hud_ensure(C, area); } } } @@ -679,8 +679,8 @@ static void rna_Space_show_region_header_set(PointerRNA *ptr, bool value) /* Special case, never show the tool properties when the header is invisible. */ bool value_for_tool_header = value; if (value == true) { - ScrArea *sa = rna_area_from_space(ptr); - ARegion *region_tool_header = BKE_area_find_region_type(sa, RGN_TYPE_TOOL_HEADER); + ScrArea *area = rna_area_from_space(ptr); + ARegion *region_tool_header = BKE_area_find_region_type(area, RGN_TYPE_TOOL_HEADER); if (region_tool_header != NULL) { value_for_tool_header = !(region_tool_header->flag & RGN_FLAG_HIDDEN_BY_USER); } @@ -773,11 +773,11 @@ static void rna_Space_show_region_hud_update(bContext *C, PointerRNA *ptr) static bool rna_Space_view2d_sync_get(PointerRNA *ptr) { - ScrArea *sa; + ScrArea *area; ARegion *region; - sa = rna_area_from_space(ptr); /* can be NULL */ - region = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); + area = rna_area_from_space(ptr); /* can be NULL */ + region = BKE_area_find_region_type(area, RGN_TYPE_WINDOW); if (region) { View2D *v2d = ®ion->v2d; return (v2d->flag & V2D_VIEWSYNC_SCREEN_TIME) != 0; @@ -788,11 +788,11 @@ static bool rna_Space_view2d_sync_get(PointerRNA *ptr) static void rna_Space_view2d_sync_set(PointerRNA *ptr, bool value) { - ScrArea *sa; + ScrArea *area; ARegion *region; - sa = rna_area_from_space(ptr); /* can be NULL */ - region = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); + area = rna_area_from_space(ptr); /* can be NULL */ + region = BKE_area_find_region_type(area, RGN_TYPE_WINDOW); if (region) { View2D *v2d = ®ion->v2d; if (value) { @@ -808,17 +808,17 @@ static void rna_Space_view2d_sync_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - ScrArea *sa; + ScrArea *area; ARegion *region; - sa = rna_area_from_space(ptr); /* can be NULL */ - region = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); + area = rna_area_from_space(ptr); /* can be NULL */ + region = BKE_area_find_region_type(area, RGN_TYPE_WINDOW); if (region) { bScreen *sc = (bScreen *)ptr->owner_id; View2D *v2d = ®ion->v2d; - UI_view2d_sync(sc, sa, v2d, V2D_LOCK_SET); + UI_view2d_sync(sc, area, v2d, V2D_LOCK_SET); } } @@ -885,10 +885,10 @@ static float rna_View3DOverlay_GridScaleUnit_get(PointerRNA *ptr) static PointerRNA rna_SpaceView3D_region_3d_get(PointerRNA *ptr) { View3D *v3d = (View3D *)(ptr->data); - ScrArea *sa = rna_area_from_space(ptr); + ScrArea *area = rna_area_from_space(ptr); void *regiondata = NULL; - if (sa) { - ListBase *regionbase = (sa->spacedata.first == v3d) ? &sa->regionbase : &v3d->regionbase; + if (area) { + ListBase *regionbase = (area->spacedata.first == v3d) ? &area->regionbase : &v3d->regionbase; ARegion *region = regionbase->last; /* always last in list, weak .. */ regiondata = region->regiondata; } @@ -900,11 +900,11 @@ static void rna_SpaceView3D_region_quadviews_begin(CollectionPropertyIterator *i PointerRNA *ptr) { View3D *v3d = (View3D *)(ptr->data); - ScrArea *sa = rna_area_from_space(ptr); + ScrArea *area = rna_area_from_space(ptr); int i = 3; ARegion *region = - ((sa && sa->spacedata.first == v3d) ? &sa->regionbase : &v3d->regionbase)->last; + ((area && area->spacedata.first == v3d) ? &area->regionbase : &v3d->regionbase)->last; ListBase lb = {NULL, NULL}; if (region && region->alignment == RGN_ALIGN_QSPLIT) { @@ -931,12 +931,12 @@ static void rna_RegionView3D_quadview_update(Main *UNUSED(main), Scene *UNUSED(scene), PointerRNA *ptr) { - ScrArea *sa; + ScrArea *area; ARegion *region; - rna_area_region_from_regiondata(ptr, &sa, ®ion); - if (sa && region && region->alignment == RGN_ALIGN_QSPLIT) { - ED_view3d_quadview_update(sa, region, false); + rna_area_region_from_regiondata(ptr, &area, ®ion); + if (area && region && region->alignment == RGN_ALIGN_QSPLIT) { + ED_view3d_quadview_update(area, region, false); } } @@ -945,12 +945,12 @@ static void rna_RegionView3D_quadview_clip_update(Main *UNUSED(main), Scene *UNUSED(scene), PointerRNA *ptr) { - ScrArea *sa; + ScrArea *area; ARegion *region; - rna_area_region_from_regiondata(ptr, &sa, ®ion); - if (sa && region && region->alignment == RGN_ALIGN_QSPLIT) { - ED_view3d_quadview_update(sa, region, true); + rna_area_region_from_regiondata(ptr, &area, ®ion); + if (area && region && region->alignment == RGN_ALIGN_QSPLIT) { + ED_view3d_quadview_update(area, region, true); } } @@ -1027,12 +1027,12 @@ static void rna_3DViewShading_type_update(Main *bmain, Scene *scene, PointerRNA rna_GPencil_update(bmain, scene, ptr); bScreen *screen = (bScreen *)ptr->owner_id; - for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { - for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { + for (ScrArea *area = screen->areabase.first; area; area = area->next) { + for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { View3D *v3d = (View3D *)sl; if (&v3d->shading == shading) { - ED_view3d_shade_update(bmain, v3d, sa); + ED_view3d_shade_update(bmain, v3d, area); return; } } @@ -1549,14 +1549,14 @@ static int rna_SpaceImageEditor_display_channels_get(PointerRNA *ptr) static void rna_SpaceImageEditor_zoom_get(PointerRNA *ptr, float *values) { SpaceImage *sima = (SpaceImage *)ptr->data; - ScrArea *sa; + ScrArea *area; ARegion *region; values[0] = values[1] = 1; /* find aregion */ - sa = rna_area_from_space(ptr); /* can be NULL */ - region = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); + area = rna_area_from_space(ptr); /* can be NULL */ + region = BKE_area_find_region_type(area, RGN_TYPE_WINDOW); if (region) { ED_space_image_get_zoom(sima, region, &values[0], &values[1]); } @@ -2030,7 +2030,7 @@ static void rna_SpaceDopeSheetEditor_action_update(bContext *C, PointerRNA *ptr) static void rna_SpaceDopeSheetEditor_mode_update(bContext *C, PointerRNA *ptr) { SpaceAction *saction = (SpaceAction *)(ptr->data); - ScrArea *sa = CTX_wm_area(C); + ScrArea *area = CTX_wm_area(C); ViewLayer *view_layer = CTX_data_view_layer(C); Object *obact = OBACT(view_layer); @@ -2070,8 +2070,8 @@ static void rna_SpaceDopeSheetEditor_mode_update(bContext *C, PointerRNA *ptr) saction->ads.filterflag |= ADS_FILTER_SUMMARY; } - if (sa && sa->spacedata.first == saction) { - ARegion *channels_region = BKE_area_find_region_type(sa, RGN_TYPE_CHANNELS); + if (area && area->spacedata.first == saction) { + ARegion *channels_region = BKE_area_find_region_type(area, RGN_TYPE_CHANNELS); if (channels_region) { if (saction->mode == SACTCONT_TIMELINE) { channels_region->flag |= RGN_FLAG_HIDDEN; @@ -2079,7 +2079,7 @@ static void rna_SpaceDopeSheetEditor_mode_update(bContext *C, PointerRNA *ptr) else { channels_region->flag &= ~RGN_FLAG_HIDDEN; } - ED_region_visibility_change_update(C, sa, channels_region); + ED_region_visibility_change_update(C, area, channels_region); } } @@ -2097,19 +2097,19 @@ static void rna_SpaceDopeSheetEditor_mode_update(bContext *C, PointerRNA *ptr) static void rna_SpaceGraphEditor_display_mode_update(bContext *C, PointerRNA *ptr) { - ScrArea *sa = rna_area_from_space(ptr); + ScrArea *area = rna_area_from_space(ptr); SpaceGraph *sipo = (SpaceGraph *)ptr->data; /* for "Drivers" mode, enable all the necessary bits and pieces */ if (sipo->mode == SIPO_MODE_DRIVERS) { - ED_drivers_editor_init(C, sa); - ED_area_tag_redraw(sa); + ED_drivers_editor_init(C, area); + ED_area_tag_redraw(area); } /* after changing view mode, must force recalculation of F-Curve colors * which can only be achieved using refresh as opposed to redraw */ - ED_area_tag_refresh(sa); + ED_area_tag_refresh(area); } static bool rna_SpaceGraphEditor_has_ghost_curves_get(PointerRNA *ptr) @@ -2137,8 +2137,8 @@ static void rna_Sequencer_view_type_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - ScrArea *sa = rna_area_from_space(ptr); - ED_area_tag_refresh(sa); + ScrArea *area = rna_area_from_space(ptr); + ED_area_tag_refresh(area); } /* Space Node Editor */ @@ -2286,8 +2286,8 @@ static void rna_SpaceClipEditor_clip_mode_update(Main *UNUSED(bmain), if (sc->mode == SC_MODE_MASKEDIT && sc->view != SC_VIEW_CLIP) { /* Make sure we are in the right view for mask editing */ sc->view = SC_VIEW_CLIP; - ScrArea *sa = rna_area_from_space(ptr); - ED_area_tag_refresh(sa); + ScrArea *area = rna_area_from_space(ptr); + ED_area_tag_refresh(area); } sc->scopes.ok = 0; @@ -2307,8 +2307,8 @@ static void rna_SpaceClipEditor_view_type_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - ScrArea *sa = rna_area_from_space(ptr); - ED_area_tag_refresh(sa); + ScrArea *area = rna_area_from_space(ptr); + ED_area_tag_refresh(area); } /* File browser. */ diff --git a/source/blender/makesrna/intern/rna_space_api.c b/source/blender/makesrna/intern/rna_space_api.c index 84c80e56d0d..a8caf905c5f 100644 --- a/source/blender/makesrna/intern/rna_space_api.c +++ b/source/blender/makesrna/intern/rna_space_api.c @@ -34,14 +34,14 @@ static void rna_RegionView3D_update(ID *id, RegionView3D *rv3d, bContext *C) { bScreen *sc = (bScreen *)id; - ScrArea *sa; + ScrArea *area; ARegion *region; - area_region_from_regiondata(sc, rv3d, &sa, ®ion); + area_region_from_regiondata(sc, rv3d, &area, ®ion); - if (sa && region && sa->spacetype == SPACE_VIEW3D) { + if (area && region && area->spacetype == SPACE_VIEW3D) { Main *bmain = CTX_data_main(C); - View3D *v3d = sa->spacedata.first; + View3D *v3d = area->spacedata.first; wmWindowManager *wm = CTX_wm_manager(C); wmWindow *win; @@ -62,9 +62,9 @@ static void rna_SpaceTextEditor_region_location_from_cursor( ID *id, SpaceText *st, int line, int column, int r_pixel_pos[2]) { bScreen *sc = (bScreen *)id; - ScrArea *sa = BKE_screen_find_area_from_space(sc, (SpaceLink *)st); - if (sa) { - ARegion *region = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); + ScrArea *area = BKE_screen_find_area_from_space(sc, (SpaceLink *)st); + if (area) { + ARegion *region = BKE_area_find_region_type(area, RGN_TYPE_WINDOW); const int cursor_co[2] = {line, column}; ED_text_region_location_from_cursor(st, region, cursor_co, r_pixel_pos); } diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index 273bef6d239..0800127fa9c 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -212,10 +212,11 @@ static void rna_Panel_unregister(Main *bmain, StructRNA *type) BLI_freelinkN(&art->paneltypes, pt); for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { - for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { - for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { + for (ScrArea *area = screen->areabase.first; area; area = area->next) { + for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == space_type) { - ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase; + ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase : + &sl->regionbase; for (ARegion *region = regionbase->first; region; region = region->next) { if (region->type == art) { for (Panel *pa = region->panels.first; pa; pa = pa->next) { diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.c b/source/blender/makesrna/intern/rna_wm_gizmo.c index 47d793382a7..104ad4c5e25 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo.c +++ b/source/blender/makesrna/intern/rna_wm_gizmo.c @@ -258,8 +258,8 @@ static wmGizmo *rna_GizmoProperties_find_operator(PointerRNA *ptr) /* We could try workaruond this lookup, but not trivial. */ for (bScreen *screen = G_MAIN->screens.first; screen; screen = screen->id.next) { IDProperty *properties = ptr->data; - for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { - for (ARegion *region = sa->regionbase.first; region; region = region->next) { + for (ScrArea *area = screen->areabase.first; area; area = area->next) { + for (ARegion *region = area->regionbase.first; region; region = region->next) { if (region->gizmo_map) { wmGizmoMap *gzmap = region->gizmo_map; for (wmGizmoGroup *gzgroup = WM_gizmomap_group_list(gzmap)->first; gzgroup; -- cgit v1.2.3