archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Rename bScreen variables from sc/scr to screen

Browse Source 
Part of T74432.

Mostly a careful batch rename but had to do few smaller fixes.

Also ran clang-format on affected files.
This commit is contained in:
Julian Eisel
2020-04-03 14:23:21 +02:00
parent cff49e625f
commit ad85989a3f
51 changed files with 514 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
View File

@@ -298,8 +298,8 @@ void WM_gizmo_group_remove_by_tool(bContext *C,
const bToolRef *tref)
{
wmGizmoMapType *gzmap_type = WM_gizmomaptype_find(&gzgt->gzmap_params);
for (bScreen *sc = bmain->screens.first; sc; sc = sc->id.next) {
for (ScrArea *area = sc->areabase.first; area; area = area->next) {
for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
for (ScrArea *area = screen->areabase.first; area; area = area->next) {
if (area->runtime.tool == tref) {
for (ARegion *region = area->regionbase.first; region; region = region->next) {
wmGizmoMap *gzmap = region->gizmo_map;
@@ -908,8 +908,8 @@ void WM_gizmomaptype_group_init_runtime(const Main *bmain,
}
/* now create a gizmo for all existing areas */
for (bScreen *sc = bmain->screens.first; sc; sc = sc->id.next) {
for (ScrArea *area = sc->areabase.first; area; area = area->next) {
for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
for (ScrArea *area = screen->areabase.first; area; area = area->next) {
for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
ListBase *lb = (sl == area->spacedata.first) ? &area->regionbase : &sl->regionbase;
for (ARegion *region = lb->first; region; region = region->next) {
@@ -963,8 +963,8 @@ void WM_gizmomaptype_group_unlink(bContext *C,
const wmGizmoGroupType *gzgt)
{
/* Free instances. */
for (bScreen *sc = bmain->screens.first; sc; sc = sc->id.next) {
for (ScrArea *area = sc->areabase.first; area; area = area->next) {
for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
for (ScrArea *area = screen->areabase.first; area; area = area->next) {
for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
ListBase *lb = (sl == area->spacedata.first) ? &area->regionbase : &sl->regionbase;
for (ARegion *region = lb->first; region; region = region->next) {

4
source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c
View File

@@ -134,8 +134,8 @@ static void gizmotype_free(wmGizmoType *gzt)
static void gizmotype_unlink(bContext *C, Main *bmain, wmGizmoType *gzt)
{
/* Free instances. */
for (bScreen *sc = bmain->screens.first; sc; sc = sc->id.next) {
for (ScrArea *area = sc->areabase.first; area; area = area->next) {
for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
for (ScrArea *area = screen->areabase.first; area; area = area->next) {
for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
ListBase *lb = (sl == area->spacedata.first) ? &area->regionbase : &sl->regionbase;
for (ARegion *region = lb->first; region; region = region->next) {