diff options
| author | Julian Eisel <julian@blender.org> | 2020-04-03 15:23:21 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-04-03 15:42:24 +0300 |
| commit | ad85989a3f8825eba990b73ce0ee59d71d9b585c (patch) | |
| tree | cd22189b8c50ce7036f4361267e2878a9faa9ac6 /source/blender/editors/space_view3d | |
| parent | cff49e625f0379d8449d20147a645f90ef2d321a (diff) | |
Cleanup: Rename bScreen variables from sc/scr to screen
Part of T74432.
Mostly a careful batch rename but had to do few smaller fixes.
Also ran clang-format on affected files.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_utils.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_view3d/view3d_utils.c b/source/blender/editors/space_view3d/view3d_utils.c index acbd4b85ece..09e1dca3152 100644 --- a/source/blender/editors/space_view3d/view3d_utils.c +++ b/source/blender/editors/space_view3d/view3d_utils.c @@ -228,13 +228,13 @@ void ED_view3d_polygon_offset(const RegionView3D *rv3d, const float dist) bool ED_view3d_context_activate(bContext *C) { - bScreen *sc = CTX_wm_screen(C); + bScreen *screen = CTX_wm_screen(C); ScrArea *area = CTX_wm_area(C); ARegion *region; /* area can be NULL when called from python */ if (area == NULL || area->spacetype != SPACE_VIEW3D) { - area = BKE_screen_find_big_area(sc, SPACE_VIEW3D, 0); + area = BKE_screen_find_big_area(screen, SPACE_VIEW3D, 0); } if (area == NULL) { diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 71a4c2e0780..ca9845b0b6e 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1201,14 +1201,14 @@ finally: static uint free_localview_bit(Main *bmain) { ScrArea *area; - bScreen *sc; + bScreen *screen; ushort local_view_bits = 0; /* sometimes we loose a localview: when an area is closed */ /* check all areas: which localviews are in use? */ - for (sc = bmain->screens.first; sc; sc = sc->id.next) { - for (area = sc->areabase.first; area; area = area->next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { + for (area = screen->areabase.first; area; area = area->next) { SpaceLink *sl = area->spacedata.first; for (; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1559,13 +1559,13 @@ void VIEW3D_OT_localview_remove_from(wmOperatorType *ot) static uint free_localcollection_bit(Main *bmain, ushort local_collections_uuid, bool *r_reset) { ScrArea *area; - bScreen *sc; + bScreen *screen; ushort local_view_bits = 0; /* Check all areas: which localviews are in use? */ - for (sc = bmain->screens.first; sc; sc = sc->id.next) { - for (area = sc->areabase.first; area; area = area->next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { + for (area = screen->areabase.first; area; area = area->next) { SpaceLink *sl = area->spacedata.first; for (; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { |