blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Cleanup: add ED_screen_areas_iter to clang-format ForEachMacros

This commit is contained in:
Jacques Lucke 2020-05-10 15:42:06 +02:00
parent 4816b1f11d
commit 51ac411ce8
Notes: blender-bot 2023-02-14 07:17:43 +01:00 
Referenced by issue #83079, GPU texture baking with large tile size fails
Referenced by issue #76638, Blender 2.8 not launching
7 changed files with 22 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.clang-format
View File

@ -256,6 +256,7 @@ ForEachMacros:
- SEQ_BEGIN
- SURFACE_QUAD_ITER_BEGIN
- foreach
- ED_screen_areas_iter
# Use once we bump the minimum version to version 8.
# # Without this string literals that in-line 'STRINGIFY' behave strangely (a bug?).

3
source/blender/editors/interface/interface_handlers.c
View File

@ -10944,8 +10944,7 @@ void UI_screen_free_active_but(const bContext *C, bScreen *screen)
{
wmWindow *win = CTX_wm_window(C);
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
uiBut *but = ui_region_find_active_but(region);
if (but) {

12
source/blender/editors/screen/screen_edit.c
View File

@ -413,8 +413,7 @@ static void region_cursor_set(wmWindow *win, bool swin_changed)
{
bScreen *screen = WM_window_get_active_screen(win);
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
if (region == screen->active_region) {
region_cursor_set_ex(win, area, region, swin_changed);
@ -467,8 +466,7 @@ void ED_screen_refresh(wmWindowManager *wm, wmWindow *win)
screen_geom_vertices_scale(win, screen);
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
/* set spacetype and region callbacks, calls init() */
/* sets subwindows for regions, adds handlers */
ED_area_initialize(wm, win, area);
@ -691,8 +689,7 @@ void ED_screen_set_active_region(bContext *C, wmWindow *win, const int xy[2])
ARegion *region;
ARegion *region_prev = screen->active_region;
ED_screen_areas_iter(win, screen, area_iter)
{
ED_screen_areas_iter (win, screen, area_iter) {
if (xy[0] > area_iter->totrct.xmin && xy[0] < area_iter->totrct.xmax) {
if (xy[1] > area_iter->totrct.ymin && xy[1] < area_iter->totrct.ymax) {
if (ED_area_azones_update(area_iter, xy) == NULL) {
@ -718,8 +715,7 @@ void ED_screen_set_active_region(bContext *C, wmWindow *win, const int xy[2])
/* Check for redraw headers. */
if (region_prev != screen->active_region) {
ED_screen_areas_iter(win, screen, area_iter)
{
ED_screen_areas_iter (win, screen, area_iter) {
bool do_draw = false;
for (region = area_iter->regionbase.first; region; region = region->next) {

6
source/blender/editors/screen/screen_ops.c
View File

@ -1741,8 +1741,7 @@ static void area_move_apply_do(const bContext *C,
/* only redraw if we actually moved a screen vert, for AREAGRID */
if (doredraw) {
bool redraw_all = false;
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
if (area->v1->editflag || area->v2->editflag || area->v3->editflag || area->v4->editflag) {
if (ED_area_is_global(area)) {
/* Snap to minimum or maximum for global areas. */
@ -1761,8 +1760,7 @@ static void area_move_apply_do(const bContext *C,
}
}
if (redraw_all) {
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
ED_area_tag_redraw(area);
}
}

3
source/blender/editors/space_sequencer/sequencer_edit.c
View File

@ -3520,7 +3520,8 @@ static int sequencer_paste_exec(bContext *C, wmOperator *op)
for (iseq = iseq_first; iseq; iseq = iseq->next) {
/* Make sure, that pasted strips have unique names. */
BKE_sequencer_recursive_apply(iseq, apply_unique_name_fn, scene);
/* Translate after name has been changed, otherwise this will affect animdata of original strip. */
/* Translate after name has been changed, otherwise this will affect animdata of original
* strip. */
BKE_sequence_translate(scene, iseq, ofs);
/* Ensure, that pasted strips don't overlap. */
if (BKE_sequence_test_overlap(ed->seqbasep, iseq)) {

18
source/blender/windowmanager/intern/wm_draw.c
View File

@ -625,8 +625,7 @@ static void wm_draw_window_offscreen(bContext *C, wmWindow *win, bool stereo)
bScreen *screen = WM_window_get_active_screen(win);
/* Draw screen areas into own frame buffer. */
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
CTX_wm_area_set(C, area);
/* Compute UI layouts for dynamically size regions. */
@ -741,8 +740,7 @@ static void wm_draw_window_onscreen(bContext *C, wmWindow *win, int view)
#endif
/* Blit non-overlapping area regions. */
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
if (region->visible && region->overlap == false) {
/* Blit from offscreen buffer. */
@ -753,8 +751,7 @@ static void wm_draw_window_onscreen(bContext *C, wmWindow *win, int view)
/* Draw paint cursors. */
if (wm->paintcursors.first) {
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
if (region->visible && region == screen->active_region) {
CTX_wm_area_set(C, area);
@ -773,8 +770,7 @@ static void wm_draw_window_onscreen(bContext *C, wmWindow *win, int view)
}
/* Blend in overlapping area regions */
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
if (region->visible && region->overlap) {
wm_draw_region_blend(region, 0, true);
@ -914,8 +910,7 @@ static bool wm_draw_update_test_window(Main *bmain, bContext *C, wmWindow *win)
}
}
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
for (region = area->regionbase.first; region; region = region->next) {
wm_region_test_gizmo_do_draw(C, area, region, true);
wm_region_test_render_do_draw(scene, depsgraph, area, region);
@ -962,8 +957,7 @@ static void wm_draw_update_clear_window(bContext *C, wmWindow *win)
{
bScreen *screen = WM_window_get_active_screen(win);
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
wm_region_test_gizmo_do_draw(C, area, region, false);
}

18
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -524,8 +524,7 @@ void wm_event_do_notifiers(bContext *C)
ED_region_do_listen(win, NULL, region, note, scene);
}
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
ED_area_do_listen(win, area, note, scene);
for (region = area->regionbase.first; region; region = region->next) {
ED_region_do_listen(win, area, region, note, scene);
@ -1655,8 +1654,7 @@ static void wm_handler_op_context(bContext *C, wmEventHandler_Op *handler, const
else {
ScrArea *area = NULL;
ED_screen_areas_iter(win, screen, area_iter)
{
ED_screen_areas_iter (win, screen, area_iter) {
if (area_iter == handler->context.area) {
area = area_iter;
break;
@ -2989,8 +2987,7 @@ static ScrArea *area_event_inside(bContext *C, const int xy[2])
bScreen *screen = CTX_wm_screen(C);
if (screen) {
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
if (BLI_rcti_isect_pt_v(&area->totrct, xy)) {
return area;
}
@ -3287,8 +3284,7 @@ void wm_event_do_handlers(bContext *C)
}
#endif
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
/* after restoring a screen from SCREENMAXIMIZED we have to wait
* with the screen handling till the region coordinates are updated */
if (screen->skip_handling == true) {
@ -3460,8 +3456,7 @@ void WM_event_add_fileselect(bContext *C, wmOperator *op)
bool cancel_handler = true;
/* find the area with the file selector for this handler */
ED_screen_areas_iter(win, screen, area)
{
ED_screen_areas_iter (win, screen, area) {
if (area->spacetype == SPACE_FILE) {
SpaceFile *sfile = area->spacedata.first;
@ -4954,8 +4949,7 @@ void WM_window_cursor_keymap_status_refresh(bContext *C, wmWindow *win)
}
ScrArea *area = NULL;
ED_screen_areas_iter(win, screen, area_iter)
{
ED_screen_areas_iter (win, screen, area_iter) {
if (BLI_findindex(&area_iter->regionbase, region) != -1) {
area = area_iter;
break;