diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 10:38:07 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 10:38:07 +0400 |
commit | ab4a2aaf4a4b2b4e416aa1f113b30362cbe0dec3 (patch) | |
tree | 81af4c18519181490074508dbe9a8d515eab634f /source/blender/editors/screen | |
parent | 5a90ea77bc1333efe4e1e54984a080550ed3f707 (diff) |
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/area.c | 330 | ||||
-rw-r--r-- | source/blender/editors/screen/glutil.c | 77 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_context.c | 114 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_edit.c | 422 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 468 | ||||
-rw-r--r-- | source/blender/editors/screen/screendump.c | 54 |
6 files changed, 740 insertions, 725 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 955a19f6725..8f429321fbb 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -117,7 +117,7 @@ void ED_region_do_listen(ARegion *ar, wmNotifier *note) /* generic notes first */ switch(note->category) { case NC_WM: - if(note->data==ND_FILEREAD) + if (note->data==ND_FILEREAD) ED_region_tag_redraw(ar); break; case NC_WINDOW: @@ -125,7 +125,7 @@ void ED_region_do_listen(ARegion *ar, wmNotifier *note) break; } - if(ar->type && ar->type->listener) + if (ar->type && ar->type->listener) ar->type->listener(ar, note); } @@ -133,7 +133,7 @@ void ED_region_do_listen(ARegion *ar, wmNotifier *note) void ED_area_do_listen(ScrArea *sa, wmNotifier *note) { /* no generic notes? */ - if(sa->type && sa->type->listener) { + if (sa->type && sa->type->listener) { sa->type->listener(sa, note); } } @@ -142,7 +142,7 @@ void ED_area_do_listen(ScrArea *sa, wmNotifier *note) void ED_area_do_refresh(bContext *C, ScrArea *sa) { /* no generic notes? */ - if(sa->type && sa->type->refresh) { + if (sa->type && sa->type->refresh) { sa->type->refresh(C, sa); } sa->do_refresh= 0; @@ -154,14 +154,14 @@ void ED_area_overdraw_flush(ScrArea *sa, ARegion *ar) { AZone *az; - for(az= sa->actionzones.first; az; az= az->next) { + for (az= sa->actionzones.first; az; az= az->next) { int xs, ys; xs= (az->x1+az->x2)/2; ys= (az->y1+az->y2)/2; /* test if inside */ - if(BLI_in_rcti(&ar->winrct, xs, ys)) { + if (BLI_in_rcti(&ar->winrct, xs, ys)) { az->do_draw= 1; } } @@ -360,22 +360,23 @@ void ED_area_overdraw(bContext *C) glEnable( GL_BLEND ); glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); - for(sa= screen->areabase.first; sa; sa= sa->next) { + for (sa= screen->areabase.first; sa; sa= sa->next) { AZone *az; - for(az= sa->actionzones.first; az; az= az->next) { - if(az->do_draw) { - if(az->type==AZONE_AREA) { + for (az= sa->actionzones.first; az; az= az->next) { + if (az->do_draw) { + if (az->type==AZONE_AREA) { area_draw_azone(az->x1, az->y1, az->x2, az->y2); - } else if(az->type==AZONE_REGION) { + } + else if (az->type==AZONE_REGION) { - if(az->ar) { + if (az->ar) { /* only display tab or icons when the region is hidden */ if (az->ar->flag & (RGN_FLAG_HIDDEN|RGN_FLAG_TOO_SMALL)) { - if(G.rt==3) + if (G.rt==3) region_draw_azone_icon(az); - else if(G.rt==2) + else if (G.rt==2) region_draw_azone_tria(az); - else if(G.rt==1) + else if (G.rt==1) region_draw_azone_tab(az); else region_draw_azone_tab_plus(az); @@ -396,19 +397,19 @@ void region_scissor_winrct(ARegion *ar, rcti *winrct) { *winrct= ar->winrct; - if(ELEM(ar->alignment, RGN_OVERLAP_LEFT, RGN_OVERLAP_RIGHT)) + if (ELEM(ar->alignment, RGN_OVERLAP_LEFT, RGN_OVERLAP_RIGHT)) return; - while(ar->prev) { + while (ar->prev) { ar= ar->prev; - if(BLI_isect_rcti(winrct, &ar->winrct, NULL)) { - if(ar->flag & RGN_FLAG_HIDDEN); - else if(ar->alignment & RGN_SPLIT_PREV); - else if(ar->alignment==RGN_OVERLAP_LEFT) { + if (BLI_isect_rcti(winrct, &ar->winrct, NULL)) { + if (ar->flag & RGN_FLAG_HIDDEN); + else if (ar->alignment & RGN_SPLIT_PREV); + else if (ar->alignment==RGN_OVERLAP_LEFT) { winrct->xmin = ar->winrct.xmax + 1; } - else if(ar->alignment==RGN_OVERLAP_RIGHT) { + else if (ar->alignment==RGN_OVERLAP_RIGHT) { winrct->xmax = ar->winrct.xmin - 1; } else break; @@ -447,14 +448,14 @@ void ED_region_do_draw(bContext *C, ARegion *ar) rcti winrct; /* see BKE_spacedata_draw_locks() */ - if(at->do_lock) + if (at->do_lock) return; /* checks other overlapping regions */ region_scissor_winrct(ar, &winrct); /* if no partial draw rect set, full rect */ - if(ar->drawrct.xmin == ar->drawrct.xmax) + if (ar->drawrct.xmin == ar->drawrct.xmax) ar->drawrct= winrct; else { /* extra clip for safety */ @@ -470,14 +471,14 @@ void ED_region_do_draw(bContext *C, ARegion *ar) UI_SetTheme(sa?sa->spacetype:0, ar->type?ar->type->regionid:0); /* optional header info instead? */ - if(ar->headerstr) { + if (ar->headerstr) { UI_ThemeClearColor(TH_HEADER); glClear(GL_COLOR_BUFFER_BIT); UI_ThemeColor(TH_TEXT); BLF_draw_default(20, 8, 0.0f, ar->headerstr, BLF_DRAW_STR_DUMMY_MAX); } - else if(at->draw) { + else if (at->draw) { at->draw(C, ar); } @@ -491,7 +492,7 @@ void ED_region_do_draw(bContext *C, ARegion *ar) uiFreeInactiveBlocks(C, &ar->uiblocks); - if(sa) + if (sa) region_draw_emboss(ar, &winrct); } @@ -502,7 +503,7 @@ void ED_region_do_draw(bContext *C, ARegion *ar) void ED_region_tag_redraw(ARegion *ar) { - if(ar) { + if (ar) { /* zero region means full region redraw */ ar->do_draw= RGN_DRAW; memset(&ar->drawrct, 0, sizeof(ar->drawrct)); @@ -511,19 +512,19 @@ void ED_region_tag_redraw(ARegion *ar) void ED_region_tag_redraw_overlay(ARegion *ar) { - if(ar) + if (ar) ar->do_draw_overlay= RGN_DRAW; } void ED_region_tag_redraw_partial(ARegion *ar, rcti *rct) { - if(ar) { - if(!ar->do_draw) { + if (ar) { + if (!ar->do_draw) { /* no redraw set yet, set partial region */ ar->do_draw= RGN_DRAW_PARTIAL; ar->drawrct= *rct; } - else if(ar->drawrct.xmin != ar->drawrct.xmax) { + else if (ar->drawrct.xmin != ar->drawrct.xmax) { /* partial redraw already set, expand region */ ar->drawrct.xmin = MIN2(ar->drawrct.xmin, rct->xmin); ar->drawrct.ymin = MIN2(ar->drawrct.ymin, rct->ymin); @@ -537,8 +538,8 @@ void ED_area_tag_redraw(ScrArea *sa) { ARegion *ar; - if(sa) - for(ar= sa->regionbase.first; ar; ar= ar->next) + if (sa) + for (ar= sa->regionbase.first; ar; ar= ar->next) ED_region_tag_redraw(ar); } @@ -546,9 +547,9 @@ void ED_area_tag_redraw_regiontype(ScrArea *sa, int regiontype) { ARegion *ar; - if(sa) { - for(ar= sa->regionbase.first; ar; ar= ar->next) { - if(ar->regiontype == regiontype) { + if (sa) { + for (ar= sa->regionbase.first; ar; ar= ar->next) { + if (ar->regiontype == regiontype) { ED_region_tag_redraw(ar); } } @@ -557,7 +558,7 @@ void ED_area_tag_redraw_regiontype(ScrArea *sa, int regiontype) void ED_area_tag_refresh(ScrArea *sa) { - if(sa) + if (sa) sa->do_refresh= 1; } @@ -569,17 +570,17 @@ void ED_area_headerprint(ScrArea *sa, const char *str) ARegion *ar; /* happens when running transform operators in backround mode */ - if(sa == NULL) + if (sa == NULL) return; - for(ar= sa->regionbase.first; ar; ar= ar->next) { - if(ar->regiontype==RGN_TYPE_HEADER) { - if(str) { - if(ar->headerstr==NULL) + for (ar= sa->regionbase.first; ar; ar= ar->next) { + if (ar->regiontype==RGN_TYPE_HEADER) { + if (str) { + if (ar->headerstr==NULL) ar->headerstr= MEM_mallocN(256, "headerprint"); BLI_strncpy(ar->headerstr, str, 256); } - else if(ar->headerstr) { + else if (ar->headerstr) { MEM_freeN(ar->headerstr); ar->headerstr= NULL; } @@ -660,8 +661,8 @@ static void region_azone_icon(ScrArea *sa, AZone *az, ARegion *ar) /* count how many actionzones with along same edge are available. * This allows for adding more action zones in the future without * having to worry about correct offset */ - for(azt= sa->actionzones.first; azt; azt= azt->next) { - if(azt->edge == az->edge) tot++; + for (azt= sa->actionzones.first; azt; azt= azt->next) { + if (azt->edge == az->edge) tot++; } switch(az->edge) { @@ -694,14 +695,14 @@ static void region_azone_icon(ScrArea *sa, AZone *az, ARegion *ar) BLI_init_rcti(&az->rect, az->x1, az->x2, az->y1, az->y2); /* if more azones on 1 spot, set offset */ - for(azt= sa->actionzones.first; azt; azt= azt->next) { - if(az!=azt) { - if( ABS(az->x1-azt->x1) < 2 && ABS(az->y1-azt->y1) < 2) { - if(az->edge==AE_TOP_TO_BOTTOMRIGHT || az->edge==AE_BOTTOM_TO_TOPLEFT) { + for (azt= sa->actionzones.first; azt; azt= azt->next) { + if (az!=azt) { + if ( ABS(az->x1-azt->x1) < 2 && ABS(az->y1-azt->y1) < 2) { + if (az->edge==AE_TOP_TO_BOTTOMRIGHT || az->edge==AE_BOTTOM_TO_TOPLEFT) { az->x1+= AZONESPOT; az->x2+= AZONESPOT; } - else{ + else { az->y1-= AZONESPOT; az->y2-= AZONESPOT; } @@ -720,13 +721,13 @@ static void region_azone_tab_plus(ScrArea *sa, AZone *az, ARegion *ar) AZone *azt; int tot= 0, add; - for(azt= sa->actionzones.first; azt; azt= azt->next) { - if(azt->edge == az->edge) tot++; + for (azt= sa->actionzones.first; azt; azt= azt->next) { + if (azt->edge == az->edge) tot++; } switch(az->edge) { case AE_TOP_TO_BOTTOMRIGHT: - if(ar->winrct.ymax == sa->totrct.ymin) add= 1; else add= 0; + if (ar->winrct.ymax == sa->totrct.ymin) add= 1; else add= 0; az->x1= ar->winrct.xmax - 2.5*AZONEPAD_TAB_PLUSW; az->y1= ar->winrct.ymax - add; az->x2= ar->winrct.xmax - 1.5*AZONEPAD_TAB_PLUSW; @@ -765,13 +766,13 @@ static void region_azone_tab(ScrArea *sa, AZone *az, ARegion *ar) AZone *azt; int tot= 0, add; - for(azt= sa->actionzones.first; azt; azt= azt->next) { - if(azt->edge == az->edge) tot++; + for (azt= sa->actionzones.first; azt; azt= azt->next) { + if (azt->edge == az->edge) tot++; } switch(az->edge) { case AE_TOP_TO_BOTTOMRIGHT: - if(ar->winrct.ymax == sa->totrct.ymin) add= 1; else add= 0; + if (ar->winrct.ymax == sa->totrct.ymin) add= 1; else add= 0; az->x1= ar->winrct.xmax - 2*AZONEPAD_TABW; az->y1= ar->winrct.ymax - add; az->x2= ar->winrct.xmax - AZONEPAD_TABW; @@ -810,13 +811,13 @@ static void region_azone_tria(ScrArea *sa, AZone *az, ARegion *ar) AZone *azt; int tot= 0, add; - for(azt= sa->actionzones.first; azt; azt= azt->next) { - if(azt->edge == az->edge) tot++; + for (azt= sa->actionzones.first; azt; azt= azt->next) { + if (azt->edge == az->edge) tot++; } switch(az->edge) { case AE_TOP_TO_BOTTOMRIGHT: - if(ar->winrct.ymax == sa->totrct.ymin) add= 1; else add= 0; + if (ar->winrct.ymax == sa->totrct.ymin) add= 1; else add= 0; az->x1= ar->winrct.xmax - 2*AZONEPAD_TRIAW; az->y1= ar->winrct.ymax - add; az->x2= ar->winrct.xmax - AZONEPAD_TRIAW; @@ -857,15 +858,16 @@ static void region_azone_initialize(ScrArea *sa, ARegion *ar, AZEdge edge) az->edge= edge; if (ar->flag & (RGN_FLAG_HIDDEN|RGN_FLAG_TOO_SMALL)) { - if(G.rt==3) + if (G.rt==3) region_azone_icon(sa, az, ar); - else if(G.rt==2) + else if (G.rt==2) region_azone_tria(sa, az, ar); - else if(G.rt==1) + else if (G.rt==1) region_azone_tab(sa, az, ar); else region_azone_tab_plus(sa, az, ar); - } else { + } + else { region_azone_edge(az, ar); } @@ -878,20 +880,20 @@ static void region_azone_add(ScrArea *sa, ARegion *ar, int alignment) { /* edge code (t b l r) is along which area edge azone will be drawn */ - if(alignment==RGN_ALIGN_TOP) + if (alignment==RGN_ALIGN_TOP) region_azone_initialize(sa, ar, AE_BOTTOM_TO_TOPLEFT); - else if(alignment==RGN_ALIGN_BOTTOM) + else if (alignment==RGN_ALIGN_BOTTOM) region_azone_initialize(sa, ar, AE_TOP_TO_BOTTOMRIGHT); - else if(ELEM(alignment, RGN_ALIGN_RIGHT, RGN_OVERLAP_RIGHT)) + else if (ELEM(alignment, RGN_ALIGN_RIGHT, RGN_OVERLAP_RIGHT)) region_azone_initialize(sa, ar, AE_LEFT_TO_TOPRIGHT); - else if(ELEM(alignment, RGN_ALIGN_LEFT, RGN_OVERLAP_LEFT)) + else if (ELEM(alignment, RGN_ALIGN_LEFT, RGN_OVERLAP_LEFT)) region_azone_initialize(sa, ar, AE_RIGHT_TO_TOPLEFT); } /* dir is direction to check, not the splitting edge direction! */ static int rct_fits(rcti *rect, char dir, int size) { - if(dir=='h') { + if (dir=='h') { return rect->xmax-rect->xmin - size; } else { // 'v' @@ -905,15 +907,15 @@ static void region_rect_recursive(ScrArea *sa, ARegion *ar, rcti *remainder, int int prefsizex, prefsizey; int alignment; - if(ar==NULL) + if (ar==NULL) return; /* no returns in function, winrct gets set in the end again */ BLI_init_rcti(&ar->winrct, 0, 0, 0, 0); /* for test; allow split of previously defined region */ - if(ar->alignment & RGN_SPLIT_PREV) - if(ar->prev) + if (ar->alignment & RGN_SPLIT_PREV) + if (ar->prev) remainder= &ar->prev->winrct; alignment = ar->alignment & ~RGN_SPLIT_PREV; @@ -921,46 +923,46 @@ static void region_rect_recursive(ScrArea *sa, ARegion *ar, rcti *remainder, int /* clear state flags first */ ar->flag &= ~RGN_FLAG_TOO_SMALL; /* user errors */ - if(ar->next==NULL && alignment!=RGN_ALIGN_QSPLIT) + if (ar->next==NULL && alignment!=RGN_ALIGN_QSPLIT) alignment= RGN_ALIGN_NONE; /* prefsize, for header we stick to exception */ prefsizex= ar->sizex?ar->sizex:ar->type->prefsizex; - if(ar->regiontype==RGN_TYPE_HEADER) + if (ar->regiontype==RGN_TYPE_HEADER) prefsizey= ar->type->prefsizey; - else if(ar->regiontype==RGN_TYPE_UI && sa->spacetype == SPACE_FILE) { + else if (ar->regiontype==RGN_TYPE_UI && sa->spacetype == SPACE_FILE) { prefsizey= UI_UNIT_Y * 2 + (UI_UNIT_Y/2); } else prefsizey= ar->sizey?ar->sizey:ar->type->prefsizey; /* hidden is user flag */ - if(ar->flag & RGN_FLAG_HIDDEN); + if (ar->flag & RGN_FLAG_HIDDEN); /* XXX floating area region, not handled yet here */ - else if(alignment == RGN_ALIGN_FLOAT); + else if (alignment == RGN_ALIGN_FLOAT); /* remainder is too small for any usage */ - else if( rct_fits(remainder, 'v', 1)<0 || rct_fits(remainder, 'h', 1) < 0 ) { + else if ( rct_fits(remainder, 'v', 1)<0 || rct_fits(remainder, 'h', 1) < 0 ) { ar->flag |= RGN_FLAG_TOO_SMALL; } - else if(alignment==RGN_ALIGN_NONE) { + else if (alignment==RGN_ALIGN_NONE) { /* typically last region */ ar->winrct= *remainder; BLI_init_rcti(remainder, 0, 0, 0, 0); } - else if(alignment==RGN_ALIGN_TOP || alignment==RGN_ALIGN_BOTTOM) { + else if (alignment==RGN_ALIGN_TOP || alignment==RGN_ALIGN_BOTTOM) { - if( rct_fits(remainder, 'v', prefsizey) < 0 ) { + if ( rct_fits(remainder, 'v', prefsizey) < 0 ) { ar->flag |= RGN_FLAG_TOO_SMALL; } else { int fac= rct_fits(remainder, 'v', prefsizey); - if(fac < 0 ) + if (fac < 0 ) prefsizey += fac; ar->winrct= *remainder; - if(alignment==RGN_ALIGN_TOP) { + if (alignment==RGN_ALIGN_TOP) { ar->winrct.ymin = ar->winrct.ymax - prefsizey + 1; remainder->ymax = ar->winrct.ymin - 1; } @@ -970,37 +972,37 @@ static void region_rect_recursive(ScrArea *sa, ARegion *ar, rcti *remainder, int } } } - else if( ELEM4(alignment, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT, RGN_OVERLAP_LEFT, RGN_OVERLAP_RIGHT)) { + else if ( ELEM4(alignment, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT, RGN_OVERLAP_LEFT, RGN_OVERLAP_RIGHT)) { - if( rct_fits(remainder, 'h', prefsizex) < 0 ) { + if ( rct_fits(remainder, 'h', prefsizex) < 0 ) { ar->flag |= RGN_FLAG_TOO_SMALL; } else { int fac= rct_fits(remainder, 'h', prefsizex); - if(fac < 0 ) + if (fac < 0 ) prefsizex += fac; ar->winrct= *remainder; - if(ELEM(alignment, RGN_ALIGN_RIGHT, RGN_OVERLAP_RIGHT)) { + if (ELEM(alignment, RGN_ALIGN_RIGHT, RGN_OVERLAP_RIGHT)) { ar->winrct.xmin = ar->winrct.xmax - prefsizex + 1; - if(alignment==RGN_ALIGN_RIGHT) + if (alignment==RGN_ALIGN_RIGHT) remainder->xmax = ar->winrct.xmin - 1; } else { ar->winrct.xmax = ar->winrct.xmin + prefsizex - 1; - if(alignment==RGN_ALIGN_LEFT) + if (alignment==RGN_ALIGN_LEFT) remainder->xmin = ar->winrct.xmax + 1; } } } - else if(alignment==RGN_ALIGN_VSPLIT || alignment==RGN_ALIGN_HSPLIT) { + else if (alignment==RGN_ALIGN_VSPLIT || alignment==RGN_ALIGN_HSPLIT) { /* percentage subdiv*/ ar->winrct= *remainder; - if(alignment==RGN_ALIGN_HSPLIT) { - if( rct_fits(remainder, 'h', prefsizex) > 4) { + if (alignment==RGN_ALIGN_HSPLIT) { + if ( rct_fits(remainder, 'h', prefsizex) > 4) { ar->winrct.xmax = (remainder->xmin+remainder->xmax)/2; remainder->xmin = ar->winrct.xmax+1; } @@ -1009,7 +1011,7 @@ static void region_rect_recursive(ScrArea *sa, ARegion *ar, rcti *remainder, int } } else { - if( rct_fits(remainder, 'v', prefsizey) > 4) { + if ( rct_fits(remainder, 'v', prefsizey) > 4) { ar->winrct.ymax = (remainder->ymin+remainder->ymax)/2; remainder->ymin = ar->winrct.ymax+1; } @@ -1018,21 +1020,21 @@ static void region_rect_recursive(ScrArea *sa, ARegion *ar, rcti *remainder, int } } } - else if(alignment==RGN_ALIGN_QSPLIT) { + else if (alignment==RGN_ALIGN_QSPLIT) { ar->winrct= *remainder; /* test if there's still 4 regions left */ - if(quad==0) { + if (quad==0) { ARegion *artest= ar->next; int count= 1; - while(artest) { + while (artest) { artest->alignment= RGN_ALIGN_QSPLIT; artest= artest->next; count++; } - if(count!=4) { + if (count!=4) { /* let's stop adding regions */ BLI_init_rcti(remainder, 0, 0, 0, 0); if (G.f & G_DEBUG) @@ -1040,16 +1042,16 @@ static void region_rect_recursive(ScrArea *sa, ARegion *ar, rcti *remainder, int } else quad= 1; } - if(quad) { - if(quad==1) { /* left bottom */ + if (quad) { + if (quad==1) { /* left bottom */ ar->winrct.xmax = (remainder->xmin + remainder->xmax)/2; ar->winrct.ymax = (remainder->ymin + remainder->ymax)/2; } - else if(quad==2) { /* left top */ + else if (quad==2) { /* left top */ ar->winrct.xmax = (remainder->xmin + remainder->xmax)/2; ar->winrct.ymin = 1 + (remainder->ymin + remainder->ymax)/2; } - else if(quad==3) { /* right bottom */ + else if (quad==3) { /* right bottom */ ar->winrct.xmin = 1 + (remainder->xmin + remainder->xmax)/2; ar->winrct.ymax = (remainder->ymin + remainder->ymax)/2; } @@ -1068,24 +1070,24 @@ static void region_rect_recursive(ScrArea *sa, ARegion *ar, rcti *remainder, int ar->winy= ar->winrct.ymax - ar->winrct.ymin + 1; /* set winrect for azones */ - if(ar->flag & (RGN_FLAG_HIDDEN|RGN_FLAG_TOO_SMALL)) { + if (ar->flag & (RGN_FLAG_HIDDEN|RGN_FLAG_TOO_SMALL)) { ar->winrct= *remainder; - if(alignment==RGN_ALIGN_TOP) + if (alignment==RGN_ALIGN_TOP) ar->winrct.ymin = ar->winrct.ymax; - else if(alignment==RGN_ALIGN_BOTTOM) + else if (alignment==RGN_ALIGN_BOTTOM) ar->winrct.ymax = ar->winrct.ymin; - else if(ELEM(alignment, RGN_ALIGN_RIGHT, RGN_OVERLAP_RIGHT)) + else if (ELEM(alignment, RGN_ALIGN_RIGHT, RGN_OVERLAP_RIGHT)) ar->winrct.xmin = ar->winrct.xmax; - else if(ELEM(alignment, RGN_ALIGN_LEFT, RGN_OVERLAP_LEFT)) + else if (ELEM(alignment, RGN_ALIGN_LEFT, RGN_OVERLAP_LEFT)) ar->winrct.xmax = ar->winrct.xmin; else /* prevent winrct to be valid */ ar->winrct.xmax = ar->winrct.xmin; } /* restore prev-split exception */ - if(ar->alignment & RGN_SPLIT_PREV) { - if(ar->prev) { + if (ar->alignment & RGN_SPLIT_PREV) { + if (ar->prev) { remainder= remainder_prev; ar->prev->winx= ar->prev->winrct.xmax - ar->prev->winrct.xmin + 1; ar->prev->winy= ar->prev->winrct.ymax - ar->prev->winrct.ymin + 1; @@ -1093,7 +1095,7 @@ static void region_rect_recursive(ScrArea *sa, ARegion *ar, rcti *remainder, int } /* in end, add azones, where appropriate */ - if(ar->regiontype == RGN_TYPE_HEADER && ar->winy + 6 > sa->winy) { + if (ar->regiontype == RGN_TYPE_HEADER && ar->winy + 6 > sa->winy) { /* The logic for this is: when the header takes up the full area, * disallow hiding it to view the main window. * @@ -1113,14 +1115,14 @@ static void area_calc_totrct(ScrArea *sa, int sizex, int sizey) { short rt= 0; // CLAMPIS(G.rt, 0, 16); - if(sa->v1->vec.x>0) sa->totrct.xmin = sa->v1->vec.x+1+rt; + if (sa->v1->vec.x>0) sa->totrct.xmin = sa->v1->vec.x+1+rt; else sa->totrct.xmin = sa->v1->vec.x; - if(sa->v4->vec.x<sizex-1) sa->totrct.xmax = sa->v4->vec.x-1-rt; + if (sa->v4->vec.x<sizex-1) sa->totrct.xmax = sa->v4->vec.x-1-rt; else sa->totrct.xmax = sa->v4->vec.x; - if(sa->v1->vec.y>0) sa->totrct.ymin = sa->v1->vec.y+1+rt; + if (sa->v1->vec.y>0) sa->totrct.ymin = sa->v1->vec.y+1+rt; else sa->totrct.ymin = sa->v1->vec.y; - if(sa->v2->vec.y<sizey-1) sa->totrct.ymax = sa->v2->vec.y-1-rt; + if (sa->v2->vec.y<sizey-1) sa->totrct.ymax = sa->v2->vec.y-1-rt; else sa->totrct.ymax = sa->v2->vec.y; /* for speedup */ @@ -1132,12 +1134,12 @@ static void area_calc_totrct(ScrArea *sa, int sizex, int sizey) /* used for area initialize below */ static void region_subwindow(wmWindow *win, ARegion *ar) { - if(ar->flag & (RGN_FLAG_HIDDEN|RGN_FLAG_TOO_SMALL)) { - if(ar->swinid) + if (ar->flag & (RGN_FLAG_HIDDEN|RGN_FLAG_TOO_SMALL)) { + if (ar->swinid) wm_subwindow_close(win, ar->swinid); ar->swinid= 0; } - else if(ar->swinid==0) + else if (ar->swinid==0) ar->swinid= wm_subwindow_open(win, &ar->winrct); else wm_subwindow_position(win, ar->swinid, &ar->winrct); @@ -1148,47 +1150,47 @@ static void ed_default_handlers(wmWindowManager *wm, ScrArea *sa, ListBase *hand /* note, add-handler checks if it already exists */ // XXX it would be good to have boundbox checks for some of these... - if(flag & ED_KEYMAP_UI) { + if (flag & ED_KEYMAP_UI) { /* user interface widgets */ UI_add_region_handlers(handlers); } - if(flag & ED_KEYMAP_VIEW2D) { + if (flag & ED_KEYMAP_VIEW2D) { /* 2d-viewport handling+manipulation */ wmKeyMap *keymap = WM_keymap_find(wm->defaultconf, "View2D", 0, 0); WM_event_add_keymap_handler(handlers, keymap); } - if(flag & ED_KEYMAP_MARKERS) { + if (flag & ED_KEYMAP_MARKERS) { /* time-markers */ wmKeyMap *keymap = WM_keymap_find(wm->defaultconf, "Markers", 0, 0); /* time space only has this keymap, the others get a boundbox restricted map */ - if(sa->spacetype!=SPACE_TIME) { + if (sa->spacetype!=SPACE_TIME) { ARegion *ar; static rcti rect= {0, 10000, 0, 30}; /* same local check for all areas */ ar= BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); - if(ar) { + if (ar) { WM_event_add_keymap_handler_bb(handlers, keymap, &rect, &ar->winrct); } } else WM_event_add_keymap_handler(handlers, keymap); } - if(flag & ED_KEYMAP_ANIMATION) { + if (flag & ED_KEYMAP_ANIMATION) { /* frame changing and timeline operators (for time spaces) */ wmKeyMap *keymap = WM_keymap_find(wm->defaultconf, "Animation", 0, 0); WM_event_add_keymap_handler(handlers, keymap); } - if(flag & ED_KEYMAP_FRAMES) { + if (flag & ED_KEYMAP_FRAMES) { /* frame changing/jumping (for all spaces) */ wmKeyMap *keymap = WM_keymap_find(wm->defaultconf, "Frames", 0, 0); WM_event_add_keymap_handler(handlers, keymap); } - if(flag & ED_KEYMAP_GPENCIL) { + if (flag & ED_KEYMAP_GPENCIL) { /* grease pencil */ wmKeyMap *keymap = WM_keymap_find(wm->defaultconf, "Grease Pencil", 0, 0); WM_event_add_keymap_handler(handlers, keymap); } - if(flag & ED_KEYMAP_HEADER) { + if (flag & ED_KEYMAP_HEADER) { /* standard keymap for headers regions */ wmKeyMap *keymap = WM_keymap_find(wm->defaultconf, "Header", 0, 0); WM_event_add_keymap_handler(handlers, keymap); @@ -1205,12 +1207,12 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa) /* set typedefinitions */ sa->type= BKE_spacetype_from_id(sa->spacetype); - if(sa->type==NULL) { + if (sa->type==NULL) { sa->butspacetype= sa->spacetype= SPACE_VIEW3D; sa->type= BKE_spacetype_from_id(sa->spacetype); } - for(ar= sa->regionbase.first; ar; ar= ar->next) + for (ar= sa->regionbase.first; ar; ar= ar->next) ar->type= BKE_regiontype_from_id(sa->type, ar->regiontype); /* area sizes */ @@ -1226,18 +1228,18 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa) /* default area handlers */ ed_default_handlers(wm, sa, &sa->handlers, sa->type->keymapflag); /* checks spacedata, adds own handlers */ - if(sa->type->init) + if (sa->type->init) sa->type->init(wm, sa); /* region windows, default and own handlers */ - for(ar= sa->regionbase.first; ar; ar= ar->next) { + for (ar= sa->regionbase.first; ar; ar= ar->next) { region_subwindow(win, ar); - if(ar->swinid) { + if (ar->swinid) { /* default region handlers */ ed_default_handlers(wm, sa, &ar->handlers, ar->type->keymapflag); /* own handlers */ - if(ar->type->init) + if (ar->type->init) ar->type->init(wm, ar); } else { @@ -1246,7 +1248,7 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa) } /* rechecks 2d matrix for header on dpi changing, do not do for other regions, it resets view && blocks view2d operator polls (ton) */ - if(ar->regiontype==RGN_TYPE_HEADER) + if (ar->regiontype==RGN_TYPE_HEADER) ar->v2d.flag &= ~V2D_IS_INITIALISED; } } @@ -1273,7 +1275,7 @@ void ED_region_toggle_hidden(bContext *C, ARegion *ar) ar->flag ^= RGN_FLAG_HIDDEN; - if(ar->flag & RGN_FLAG_HIDDEN) + if (ar->flag & RGN_FLAG_HIDDEN) WM_event_remove_handlers(C, &ar->handlers); ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), sa); @@ -1292,10 +1294,10 @@ void area_copy_data(ScrArea *sa1, ScrArea *sa2, int swap_space) sa1->spacetype= sa2->spacetype; sa1->butspacetype= sa2->butspacetype; - if(swap_space == 1) { + if (swap_space == 1) { SWAP(ListBase, sa1->spacedata, sa2->spacedata); /* exception: ensure preview is reset */ -// if(sa1->spacetype==SPACE_VIEW3D) +// if (sa1->spacetype==SPACE_VIEW3D) // XXX BIF_view3d_previewrender_free(sa1->spacedata.first); } else if (swap_space == 2) { @@ -1309,19 +1311,19 @@ void area_copy_data(ScrArea *sa1, ScrArea *sa2, int swap_space) /* Note; SPACE_EMPTY is possible on new screens */ /* regions */ - if(swap_space == 1) { + if (swap_space == 1) { SWAP(ListBase, sa1->regionbase, sa2->regionbase); } else { - if(swap_space<2) { + if (swap_space<2) { st= BKE_spacetype_from_id(spacetype); - for(ar= sa1->regionbase.first; ar; ar= ar->next) + for (ar= sa1->regionbase.first; ar; ar= ar->next) BKE_area_region_free(st, ar); BLI_freelistN(&sa1->regionbase); } st= BKE_spacetype_from_id(sa2->spacetype); - for(ar= sa2->regionbase.first; ar; ar= ar->next) { + for (ar= sa2->regionbase.first; ar; ar= ar->next) { ARegion *newar= BKE_area_region_copy(st, ar); BLI_addtail(&sa1->regionbase, newar); } @@ -1357,7 +1359,7 @@ void ED_area_swapspace(bContext *C, ScrArea *sa1, ScrArea *sa2) void ED_area_newspace(bContext *C, ScrArea *sa, int type) { - if(sa->spacetype != type) { + if (sa->spacetype != type) { SpaceType *st; SpaceLink *slold; SpaceLink *sl; @@ -1373,14 +1375,14 @@ void ED_area_newspace(bContext *C, ScrArea *sa, int type) /* check previously stored space */ for (sl= sa->spacedata.first; sl; sl= sl->next) - if(sl->spacetype==type) + if (sl->spacetype==type) break; /* old spacedata... happened during work on 2.50, remove */ - if(sl && sl->regionbase.first==NULL) { + if (sl && sl->regionbase.first==NULL) { st->free(sl); BLI_freelinkN(&sa->spacedata, sl); - if(slold == sl) { + if (slold == sl) { slold= NULL; } sl= NULL; @@ -1399,12 +1401,12 @@ void ED_area_newspace(bContext *C, ScrArea *sa, int type) } else { /* new space */ - if(st) { + if (st) { sl= st->new(C); BLI_addhead(&sa->spacedata, sl); /* swap regions */ - if(slold) + if (slold) slold->regionbase= sa->regionbase; sa->regionbase= sl->regionbase; sl->regionbase.first= sl->regionbase.last= NULL; @@ -1430,10 +1432,10 @@ void ED_area_prevspace(bContext *C, ScrArea *sa) { SpaceLink *sl = (sa) ? sa->spacedata.first : CTX_wm_space_data(C); - if(sl->next) { + if (sl->next) { /* workaround for case of double prevspace, render window * with a file browser on top of it */ - if(sl->next->spacetype == SPACE_FILE && sl->next->next) + if (sl->next->spacetype == SPACE_FILE && sl->next->next) ED_area_newspace(C, sa, sl->next->next->spacetype); else ED_area_newspace(C, sa, sl->next->spacetype); @@ -1561,10 +1563,10 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char * View2DScrollers *scrollers; int x, y, xco, yco, w, em, triangle, open, newcontext= 0; - if(contextnr >= 0) + if (contextnr >= 0) newcontext= UI_view2d_tab_set(v2d, contextnr); - if(vertical) { + if (vertical) { w= v2d->cur.xmax - v2d->cur.xmin; em= (ar->type->prefsizex)? UI_UNIT_Y/2: UI_UNIT_Y; } @@ -1579,21 +1581,21 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char * /* set view2d view matrix for scrolling (without scrollers) */ UI_view2d_view_ortho(v2d); - for(pt= ar->type->paneltypes.first; pt; pt= pt->next) { + for (pt= ar->type->paneltypes.first; pt; pt= pt->next) { /* verify context */ - if(context) - if(pt->context[0] && strcmp(context, pt->context) != 0) + if (context) + if (pt->context[0] && strcmp(context, pt->context) != 0) continue; /* draw panel */ - if(pt->draw && (!pt->poll || pt->poll(C, pt))) { + if (pt->draw && (!pt->poll || pt->poll(C, pt))) { block= uiBeginBlock(C, ar, pt->idname, UI_EMBOSS); panel= uiBeginPanel(sa, ar, block, pt, &open); /* bad fixed values */ triangle= (int)(UI_UNIT_Y * 1.1f); - if(pt->draw_header && !(pt->flag & PNL_NO_HEADER) && (open || vertical)) { + if (pt->draw_header && !(pt->flag & PNL_NO_HEADER) && (open || vertical)) { /* for enabled buttons */ panel->layout= uiBlockLayout(block, UI_LAYOUT_HORIZONTAL, UI_LAYOUT_HEADER, triangle, UI_UNIT_Y+style->panelspace+2, UI_UNIT_Y, 1, style); @@ -1608,7 +1610,7 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char * panel->labelofs= 0; } - if(open) { + if (open) { short panelContext; /* panel context can either be toolbar region or normal panels region */ @@ -1645,7 +1647,7 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char * glClear(GL_COLOR_BUFFER_BIT); /* before setting the view */ - if(vertical) { + if (vertical) { /* only allow scrolling in vertical direction */ v2d->keepofs |= V2D_LOCKOFS_X|V2D_KEEPOFS_Y; v2d->keepofs &= ~(V2D_LOCKOFS_Y|V2D_KEEPOFS_X); @@ -1653,7 +1655,7 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char * v2d->scroll &= ~V2D_SCROLL_VERTICAL_HIDE; // don't jump back when panels close or hide - if(!newcontext) + if (!newcontext) y= MAX2(-y, -v2d->cur.ymin); else y= -y; @@ -1669,7 +1671,7 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char * v2d->scroll &= ~V2D_SCROLL_HORIZONTAL_HIDE; // don't jump back when panels close or hide - if(!newcontext) + if (!newcontext) x= MAX2(x, v2d->cur.xmax); y= -y; } @@ -1704,7 +1706,7 @@ void ED_region_panels_init(wmWindowManager *wm, ARegion *ar) ar->v2d.keepzoom |= V2D_KEEPZOOM; // correctly initialized User-Prefs? - if(!(ar->v2d.align & V2D_ALIGN_NO_POS_Y)) + if (!(ar->v2d.align & V2D_ALIGN_NO_POS_Y)) ar->v2d.flag &= ~V2D_IS_INITIALISED; UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_PANELS_UI, ar->winx, ar->winy); @@ -1734,25 +1736,25 @@ void ED_region_header(const bContext *C, ARegion *ar) yco= headery-4; /* draw all headers types */ - for(ht= ar->type->headertypes.first; ht; ht= ht->next) { + for (ht= ar->type->headertypes.first; ht; ht= ht->next) { block= uiBeginBlock(C, ar, ht->idname, UI_EMBOSS); layout= uiBlockLayout(block, UI_LAYOUT_HORIZONTAL, UI_LAYOUT_HEADER, xco, yco, UI_UNIT_Y, 1, style); - if(ht->draw) { + if (ht->draw) { header.type= ht; header.layout= layout; ht->draw(C, &header); /* for view2d */ xco= uiLayoutGetWidth(layout); - if(xco > maxco) + if (xco > maxco) maxco= xco; } uiBlockLayoutResolve(block, &xco, &yco); /* for view2d */ - if(xco > maxco) + if (xco > maxco) maxco= xco; uiEndBlock(C, block); @@ -1791,7 +1793,7 @@ void ED_region_info_draw(ARegion *ar, const char *text, int block, float alpha) rect.xmin = 0; rect.ymin = ar->winrct.ymax - ar->winrct.ymin - header_height; - if(block) { + if (block) { rect.xmax = ar->winrct.xmax - ar->winrct.xmin; } else { diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index 495bfb9ba39..28fe8caf34b 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -150,7 +150,7 @@ void fdrawbezier(float vec[4][3]) glBegin(GL_LINE_STRIP); while (spline_step < 1.000001f) { #if 0 - if(do_shaded) + if (do_shaded) UI_ThemeColorBlend(th_col1, th_col2, spline_step); #endif glEvalCoord1f(spline_step); @@ -261,7 +261,7 @@ void sdrawbox(short x1, short y1, short x2, short y2) void setlinestyle(int nr) { - if(nr==0) { + if (nr==0) { glDisable(GL_LINE_STIPPLE); } else { @@ -284,7 +284,7 @@ void set_inverted_drawing(int enable) void sdrawXORline(int x0, int y0, int x1, int y1) { - if(x0==x1 && y0==y1) return; + if (x0==x1 && y0==y1) return; set_inverted_drawing(1); @@ -306,7 +306,7 @@ void sdrawXORline4(int nr, int x0, int y0, int x1, int y1) set_inverted_drawing(1); glBegin(GL_LINES); - if(nr== -1) { /* flush */ + if (nr== -1) { /* flush */ for (nr=0; nr<4; nr++) { if (flags[nr]) { glVertex2sv(old[nr][0]); @@ -314,9 +314,10 @@ void sdrawXORline4(int nr, int x0, int y0, int x1, int y1) flags[nr]= 0; } } - } else { - if(nr>=0 && nr<4) { - if(flags[nr]) { + } + else { + if (nr>=0 && nr<4) { + if (flags[nr]) { glVertex2sv(old[nr][0]); glVertex2sv(old[nr][1]); } @@ -339,7 +340,7 @@ void sdrawXORline4(int nr, int x0, int y0, int x1, int y1) void fdrawXORellipse(float xofs, float yofs, float hw, float hh) { - if(hw==0) return; + if (hw==0) return; set_inverted_drawing(1); @@ -502,28 +503,28 @@ void glaDrawPixelsTexScaled(float x, float y, int img_w, int img_h, int format, float rast_y= y+subpart_y*offset_y*yzoom; /* check if we already got these because we always get 2 more when doing seamless*/ - if(subpart_w<=seamless || subpart_h<=seamless) + if (subpart_w<=seamless || subpart_h<=seamless) continue; - if(format==GL_FLOAT) { + if (format==GL_FLOAT) { glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, subpart_w, subpart_h, GL_RGBA, GL_FLOAT, &f_rect[subpart_y*offset_y*img_w*4 + subpart_x*offset_x*4]); /* add an extra border of pixels so linear looks ok at edges of full image. */ - if(subpart_w<tex_w) + if (subpart_w<tex_w) glTexSubImage2D(GL_TEXTURE_2D, 0, subpart_w, 0, 1, subpart_h, GL_RGBA, GL_FLOAT, &f_rect[subpart_y*offset_y*img_w*4 + (subpart_x*offset_x+subpart_w-1)*4]); - if(subpart_h<tex_h) + if (subpart_h<tex_h) glTexSubImage2D(GL_TEXTURE_2D, 0, 0, subpart_h, subpart_w, 1, GL_RGBA, GL_FLOAT, &f_rect[(subpart_y*offset_y+subpart_h-1)*img_w*4 + subpart_x*offset_x*4]); - if(subpart_w<tex_w && subpart_h<tex_h) + if (subpart_w<tex_w && subpart_h<tex_h) glTexSubImage2D(GL_TEXTURE_2D, 0, subpart_w, subpart_h, 1, 1, GL_RGBA, GL_FLOAT, &f_rect[(subpart_y*offset_y+subpart_h-1)*img_w*4 + (subpart_x*offset_x+subpart_w-1)*4]); } else { glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, subpart_w, subpart_h, GL_RGBA, GL_UNSIGNED_BYTE, &uc_rect[subpart_y*offset_y*img_w*4 + subpart_x*offset_x*4]); - if(subpart_w<tex_w) + if (subpart_w<tex_w) glTexSubImage2D(GL_TEXTURE_2D, 0, subpart_w, 0, 1, subpart_h, GL_RGBA, GL_UNSIGNED_BYTE, &uc_rect[subpart_y*offset_y*img_w*4 + (subpart_x*offset_x+subpart_w-1)*4]); - if(subpart_h<tex_h) + if (subpart_h<tex_h) glTexSubImage2D(GL_TEXTURE_2D, 0, 0, subpart_h, subpart_w, 1, GL_RGBA, GL_UNSIGNED_BYTE, &uc_rect[(subpart_y*offset_y+subpart_h-1)*img_w*4 + subpart_x*offset_x*4]); - if(subpart_w<tex_w && subpart_h<tex_h) + if (subpart_w<tex_w && subpart_h<tex_h) glTexSubImage2D(GL_TEXTURE_2D, 0, subpart_w, subpart_h, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &uc_rect[(subpart_y*offset_y+subpart_h-1)*img_w*4 + (subpart_x*offset_x+subpart_w-1)*4]); } @@ -608,27 +609,28 @@ void glaDrawPixelsSafe(float x, float y, int img_w, int img_h, int row_w, int fo /* Don't use safe RasterPos (slower) if we can avoid it. */ if (rast_x>=0 && rast_y>=0) { glRasterPos2f(rast_x, rast_y); - } else { + } + else { glaRasterPosSafe2f(rast_x, rast_y, 0, 0); } glPixelStorei(GL_UNPACK_ROW_LENGTH, row_w); - if(format==GL_LUMINANCE || format==GL_RED) { - if(type==GL_FLOAT) { + if (format==GL_LUMINANCE || format==GL_RED) { + if (type==GL_FLOAT) { float *f_rect= (float *)rect; glDrawPixels(draw_w, draw_h, format, type, f_rect + (off_y*row_w + off_x)); } - else if(type==GL_INT || type==GL_UNSIGNED_INT) { + else if (type==GL_INT || type==GL_UNSIGNED_INT) { int *i_rect= (int *)rect; glDrawPixels(draw_w, draw_h, format, type, i_rect + (off_y*row_w + off_x)); } } else { /* RGBA */ - if(type==GL_FLOAT) { + if (type==GL_FLOAT) { float *f_rect= (float *)rect; glDrawPixels(draw_w, draw_h, format, type, f_rect + (off_y*row_w + off_x)*4); } - else if(type==GL_UNSIGNED_BYTE) { + else if (type==GL_UNSIGNED_BYTE) { unsigned char *uc_rect= (unsigned char *) rect; glDrawPixels(draw_w, draw_h, format, type, uc_rect + (off_y*row_w + off_x)*4); } @@ -709,7 +711,8 @@ gla2DDrawInfo *glaBegin2DDraw(rcti *screen_rect, rctf *world_rect) di->screen_rect= *screen_rect; if (world_rect) { di->world_rect= *world_rect; - } else { + } + else { di->world_rect.xmin = di->screen_rect.xmin; di->world_rect.ymin = di->screen_rect.ymin; di->world_rect.xmax = di->screen_rect.xmax; @@ -765,13 +768,13 @@ void bglBegin(int mode) { curmode= mode; - if(mode==GL_POINTS) { + if (mode==GL_POINTS) { float value[4]; glGetFloatv(GL_POINT_SIZE_RANGE, value); - if(value[1] < 2.0f) { + if (value[1] < 2.0f) { glGetFloatv(GL_POINT_SIZE, value); pointhack= floor(value[0] + 0.5f); - if(pointhack>4) pointhack= 4; + if (pointhack>4) pointhack= 4; } else glBegin(mode); } @@ -782,10 +785,10 @@ int bglPointHack(void) float value[4]; int pointhack_px; glGetFloatv(GL_POINT_SIZE_RANGE, value); - if(value[1] < 2.0f) { + if (value[1] < 2.0f) { glGetFloatv(GL_POINT_SIZE, value); pointhack_px= floorf(value[0]+0.5f); - if(pointhack_px>4) pointhack_px= 4; + if (pointhack_px>4) pointhack_px= 4; return pointhack_px; } return 0; @@ -795,7 +798,7 @@ void bglVertex3fv(const float vec[3]) { switch(curmode) { case GL_POINTS: - if(pointhack) { + if (pointhack) { glRasterPos3fv(vec); glBitmap(pointhack, pointhack, (float)pointhack/2.0f, (float)pointhack/2.0f, 0.0, 0.0, Squaredot); } @@ -808,7 +811,7 @@ void bglVertex3f(float x, float y, float z) { switch(curmode) { case GL_POINTS: - if(pointhack) { + if (pointhack) { glRasterPos3f(x, y, z); glBitmap(pointhack, pointhack, (float)pointhack/2.0f, (float)pointhack/2.0f, 0.0, 0.0, Squaredot); } @@ -821,7 +824,7 @@ void bglVertex2fv(const float vec[2]) { switch(curmode) { case GL_POINTS: - if(pointhack) { + if (pointhack) { glRasterPos2fv(vec); glBitmap(pointhack, pointhack, (float)pointhack/2, pointhack/2, 0.0, 0.0, Squaredot); } @@ -833,7 +836,7 @@ void bglVertex2fv(const float vec[2]) void bglEnd(void) { - if(pointhack) pointhack= 0; + if (pointhack) pointhack= 0; else glEnd(); } @@ -849,10 +852,10 @@ void bgl_get_mats(bglMats *mats) /* Very strange code here - it seems that certain bad values in the * modelview matrix can cause gluUnProject to give bad results. */ - if(mats->modelview[0] < badvalue && + if (mats->modelview[0] < badvalue && mats->modelview[0] > -badvalue) mats->modelview[0]= 0; - if(mats->modelview[5] < badvalue && + if (mats->modelview[5] < badvalue && mats->modelview[5] > -badvalue) mats->modelview[5]= 0; @@ -868,7 +871,7 @@ void bglPolygonOffset(float viewdist, float dist) { static float winmat[16], offset=0.0; - if(dist != 0.0f) { + if (dist != 0.0f) { float offs; // glEnable(GL_POLYGON_OFFSET_FILL); @@ -880,7 +883,7 @@ void bglPolygonOffset(float viewdist, float dist) /* dist is from camera to center point */ - if(winmat[15]>0.5f) offs= 0.00001f*dist*viewdist; // ortho tweaking + if (winmat[15]>0.5f) offs= 0.00001f*dist*viewdist; // ortho tweaking else offs= 0.0005f*dist; // should be clipping value or so... winmat[14]-= offs; @@ -903,7 +906,7 @@ void bglFlush(void) { glFlush(); #ifdef __APPLE__ -// if(GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_MAC, GPU_DRIVER_OFFICIAL)) +// if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_MAC, GPU_DRIVER_OFFICIAL)) // XXX myswapbuffers(); //hack to get mac intel graphics to show frontbuffer #endif } diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 9e2a2f54e0b..9e044068468 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -87,20 +87,20 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult base= BASACT; #endif - if(CTX_data_dir(member)) { + if (CTX_data_dir(member)) { CTX_data_dir_set(result, screen_context_dir); return 1; } - else if(CTX_data_equals(member, "scene")) { + else if (CTX_data_equals(member, "scene")) { CTX_data_id_pointer_set(result, &scene->id); return 1; } - else if(CTX_data_equals(member, "visible_objects") || CTX_data_equals(member, "visible_bases")) { + else if (CTX_data_equals(member, "visible_objects") || CTX_data_equals(member, "visible_bases")) { int visible_objects= CTX_data_equals(member, "visible_objects"); - for(base=scene->base.first; base; base=base->next) { - if(((base->object->restrictflag & OB_RESTRICT_VIEW) == 0) && (base->lay & scene->lay)) { - if(visible_objects) + for (base=scene->base.first; base; base=base->next) { + if (((base->object->restrictflag & OB_RESTRICT_VIEW) == 0) && (base->lay & scene->lay)) { + if (visible_objects) CTX_data_id_list_add(result, &base->object->id); else CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base); @@ -109,13 +109,13 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION); return 1; } - else if(CTX_data_equals(member, "selectable_objects") || CTX_data_equals(member, "selectable_bases")) { + else if (CTX_data_equals(member, "selectable_objects") || CTX_data_equals(member, "selectable_bases")) { int selectable_objects= CTX_data_equals(member, "selectable_objects"); - for(base=scene->base.first; base; base=base->next) { - if(base->lay & lay) { - if((base->object->restrictflag & OB_RESTRICT_VIEW)==0 && (base->object->restrictflag & OB_RESTRICT_SELECT)==0) { - if(selectable_objects) + for (base=scene->base.first; base; base=base->next) { + if (base->lay & lay) { + if ((base->object->restrictflag & OB_RESTRICT_VIEW)==0 && (base->object->restrictflag & OB_RESTRICT_SELECT)==0) { + if (selectable_objects) CTX_data_id_list_add(result, &base->object->id); else CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base); @@ -125,12 +125,12 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION); return 1; } - else if(CTX_data_equals(member, "selected_objects") || CTX_data_equals(member, "selected_bases")) { + else if (CTX_data_equals(member, "selected_objects") || CTX_data_equals(member, "selected_bases")) { int selected_objects= CTX_data_equals(member, "selected_objects"); - for(base=scene->base.first; base; base=base->next) { - if((base->flag & SELECT) && (base->lay & scene->lay)) { - if(selected_objects) + for (base=scene->base.first; base; base=base->next) { + if ((base->flag & SELECT) && (base->lay & scene->lay)) { + if (selected_objects) CTX_data_id_list_add(result, &base->object->id); else CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base); @@ -139,14 +139,14 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION); return 1; } - else if(CTX_data_equals(member, "selected_editable_objects") || CTX_data_equals(member, "selected_editable_bases")) { + else if (CTX_data_equals(member, "selected_editable_objects") || CTX_data_equals(member, "selected_editable_bases")) { int selected_editable_objects= CTX_data_equals(member, "selected_editable_objects"); - for(base=scene->base.first; base; base=base->next) { - if((base->flag & SELECT) && (base->lay & scene->lay)) { - if((base->object->restrictflag & OB_RESTRICT_VIEW)==0) { - if(0==object_is_libdata(base->object)) { - if(selected_editable_objects) + for (base=scene->base.first; base; base=base->next) { + if ((base->flag & SELECT) && (base->lay & scene->lay)) { + if ((base->object->restrictflag & OB_RESTRICT_VIEW)==0) { + if (0==object_is_libdata(base->object)) { + if (selected_editable_objects) CTX_data_id_list_add(result, &base->object->id); else CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base); @@ -157,7 +157,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION); return 1; } - else if(CTX_data_equals(member, "visible_bones") || CTX_data_equals(member, "editable_bones")) { + else if (CTX_data_equals(member, "visible_bones") || CTX_data_equals(member, "editable_bones")) { bArmature *arm= (obedit && obedit->type == OB_ARMATURE) ? obedit->data : NULL; EditBone *ebone, *flipbone=NULL; int editable_bones= CTX_data_equals(member, "editable_bones"); @@ -199,7 +199,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } } - else if(CTX_data_equals(member, "selected_bones") || CTX_data_equals(member, "selected_editable_bones")) { + else if (CTX_data_equals(member, "selected_bones") || CTX_data_equals(member, "selected_editable_bones")) { bArmature *arm= (obedit && obedit->type == OB_ARMATURE) ? obedit->data : NULL; EditBone *ebone, *flipbone=NULL; int selected_editable_bones= CTX_data_equals(member, "selected_editable_bones"); @@ -241,7 +241,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } } - else if(CTX_data_equals(member, "visible_pose_bones")) { + else if (CTX_data_equals(member, "visible_pose_bones")) { Object *obpose= object_pose_armature_get(obact); bArmature *arm= (obpose) ? obpose->data : NULL; bPoseChannel *pchan; @@ -257,7 +257,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } } - else if(CTX_data_equals(member, "selected_pose_bones")) { + else if (CTX_data_equals(member, "selected_pose_bones")) { Object *obpose= object_pose_armature_get(obact); bArmature *arm= (obpose) ? obpose->data : NULL; bPoseChannel *pchan; @@ -274,24 +274,24 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } } - else if(CTX_data_equals(member, "active_bone")) { - if(obact && obact->type == OB_ARMATURE) { + else if (CTX_data_equals(member, "active_bone")) { + if (obact && obact->type == OB_ARMATURE) { bArmature *arm= obact->data; - if(arm->edbo) { - if(arm->act_edbone) { + if (arm->edbo) { + if (arm->act_edbone) { CTX_data_pointer_set(result, &arm->id, &RNA_EditBone, arm->act_edbone); return 1; } } else { - if(arm->act_bone) { + if (arm->act_bone) { CTX_data_pointer_set(result, &arm->id, &RNA_Bone, arm->act_bone); return 1; } } } } - else if(CTX_data_equals(member, "active_pose_bone")) { + else if (CTX_data_equals(member, "active_pose_bone")) { bPoseChannel *pchan; Object *obpose= object_pose_armature_get(obact); @@ -301,64 +301,64 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } } - else if(CTX_data_equals(member, "active_base")) { - if(base) + else if (CTX_data_equals(member, "active_base")) { + if (base) CTX_data_pointer_set(result, &scene->id, &RNA_ObjectBase, base); return 1; } - else if(CTX_data_equals(member, "active_object")) { - if(obact) + else if (CTX_data_equals(member, "active_object")) { + if (obact) CTX_data_id_pointer_set(result, &obact->id); return 1; } - else if(CTX_data_equals(member, "object")) { - if(obact) + else if (CTX_data_equals(member, "object")) { + if (obact) CTX_data_id_pointer_set(result, &obact->id); return 1; } - else if(CTX_data_equals(member, "edit_object")) { + else if (CTX_data_equals(member, "edit_object")) { /* convenience for now, 1 object per scene in editmode */ - if(obedit) + if (obedit) CTX_data_id_pointer_set(result, &obedit->id); return 1; } - else if(CTX_data_equals(member, "sculpt_object")) { - if(obact && (obact->mode & OB_MODE_SCULPT)) + else if (CTX_data_equals(member, "sculpt_object")) { + if (obact && (obact->mode & OB_MODE_SCULPT)) CTX_data_id_pointer_set(result, &obact->id); return 1; } - else if(CTX_data_equals(member, "vertex_paint_object")) { - if(obact && (obact->mode & OB_MODE_VERTEX_PAINT)) + else if (CTX_data_equals(member, "vertex_paint_object")) { + if (obact && (obact->mode & OB_MODE_VERTEX_PAINT)) CTX_data_id_pointer_set(result, &obact->id); return 1; } - else if(CTX_data_equals(member, "weight_paint_object")) { - if(obact && (obact->mode & OB_MODE_WEIGHT_PAINT)) + else if (CTX_data_equals(member, "weight_paint_object")) { + if (obact && (obact->mode & OB_MODE_WEIGHT_PAINT)) CTX_data_id_pointer_set(result, &obact->id); return 1; } - else if(CTX_data_equals(member, "image_paint_object")) { - if(obact && (obact->mode & OB_MODE_TEXTURE_PAINT)) + else if (CTX_data_equals(member, "image_paint_object")) { + if (obact && (obact->mode & OB_MODE_TEXTURE_PAINT)) CTX_data_id_pointer_set(result, &obact->id); return 1; } - else if(CTX_data_equals(member, "particle_edit_object")) { - if(obact && (obact->mode & OB_MODE_PARTICLE_EDIT)) + else if (CTX_data_equals(member, "particle_edit_object")) { + if (obact && (obact->mode & OB_MODE_PARTICLE_EDIT)) CTX_data_id_pointer_set(result, &obact->id); return 1; } - else if(CTX_data_equals(member, "sequences")) { + else if (CTX_data_equals(member, "sequences")) { Editing *ed= seq_give_editing(scene, FALSE); - if(ed) { + if (ed) { Sequence *seq; for (seq= ed->seqbasep->first; seq; seq= seq->next) { CTX_data_list_add(result, &scene->id, &RNA_Sequence, seq); @@ -367,9 +367,9 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } } - else if(CTX_data_equals(member, "selected_sequences")) { + else if (CTX_data_equals(member, "selected_sequences")) { Editing *ed= seq_give_editing(scene, FALSE); - if(ed) { + if (ed) { Sequence *seq; for (seq= ed->seqbasep->first; seq; seq= seq->next) { if (seq->flag & SELECT) { @@ -380,9 +380,9 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } } - else if(CTX_data_equals(member, "selected_editable_sequences")) { + else if (CTX_data_equals(member, "selected_editable_sequences")) { Editing *ed= seq_give_editing(scene, FALSE); - if(ed) { + if (ed) { Sequence *seq; for (seq= ed->seqbasep->first; seq; seq= seq->next) { if (seq->flag & SELECT && !(seq->flag & SEQ_LOCK)) { @@ -393,11 +393,11 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } } - else if(CTX_data_equals(member, "active_operator")) { + else if (CTX_data_equals(member, "active_operator")) { wmOperator *op= NULL; SpaceFile *sfile= CTX_wm_space_file(C); - if(sfile) { + if (sfile) { op= sfile->op; } else if ((op= uiContextActiveOperator(C))) { diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index f07ca8b87e1..48b1afad891 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -111,7 +111,7 @@ ScrEdge *screen_findedge(bScreen *sc, ScrVert *v1, ScrVert *v2) sortscrvert(&v1, &v2); for (se= sc->edgebase.first; se; se= se->next) - if(se->v1==v1 && se->v2==v2) + if (se->v1==v1 && se->v2==v2) return se; return NULL; @@ -124,12 +124,12 @@ void removedouble_scrverts(bScreen *sc) ScrArea *sa; verg= sc->vertbase.first; - while(verg) { - if(verg->newv==NULL) { /* !!! */ + while (verg) { + if (verg->newv==NULL) { /* !!! */ v1= verg->next; - while(v1) { - if(v1->newv==NULL) { /* !?! */ - if(v1->vec.x==verg->vec.x && v1->vec.y==verg->vec.y) { + while (v1) { + if (v1->newv==NULL) { /* !?! */ + if (v1->vec.x==verg->vec.x && v1->vec.y==verg->vec.y) { /* printf("doublevert\n"); */ v1->newv= verg; } @@ -142,27 +142,27 @@ void removedouble_scrverts(bScreen *sc) /* replace pointers in edges and faces */ se= sc->edgebase.first; - while(se) { - if(se->v1->newv) se->v1= se->v1->newv; - if(se->v2->newv) se->v2= se->v2->newv; + while (se) { + if (se->v1->newv) se->v1= se->v1->newv; + if (se->v2->newv) se->v2= se->v2->newv; /* edges changed: so.... */ sortscrvert(&(se->v1), &(se->v2)); se= se->next; } sa= sc->areabase.first; - while(sa) { - if(sa->v1->newv) sa->v1= sa->v1->newv; - if(sa->v2->newv) sa->v2= sa->v2->newv; - if(sa->v3->newv) sa->v3= sa->v3->newv; - if(sa->v4->newv) sa->v4= sa->v4->newv; + while (sa) { + if (sa->v1->newv) sa->v1= sa->v1->newv; + if (sa->v2->newv) sa->v2= sa->v2->newv; + if (sa->v3->newv) sa->v3= sa->v3->newv; + if (sa->v4->newv) sa->v4= sa->v4->newv; sa= sa->next; } /* remove */ verg= sc->vertbase.first; - while(verg) { + while (verg) { v1= verg->next; - if(verg->newv) { + if (verg->newv) { BLI_remlink(&sc->vertbase, verg); MEM_freeN(verg); } @@ -179,16 +179,16 @@ void removenotused_scrverts(bScreen *sc) /* we assume edges are ok */ se= sc->edgebase.first; - while(se) { + while (se) { se->v1->flag= 1; se->v2->flag= 1; se= se->next; } sv= sc->vertbase.first; - while(sv) { + while (sv) { svn= sv->next; - if(sv->flag==0) { + if (sv->flag==0) { BLI_remlink(&sc->vertbase, sv); MEM_freeN(sv); } @@ -203,11 +203,11 @@ void removedouble_scredges(bScreen *sc) /* compare */ verg= sc->edgebase.first; - while(verg) { + while (verg) { se= verg->next; - while(se) { + while (se) { sn= se->next; - if(verg->v1==se->v1 && verg->v2==se->v2) { + if (verg->v1==se->v1 && verg->v2==se->v2) { BLI_remlink(&sc->edgebase, se); MEM_freeN(se); } @@ -225,26 +225,26 @@ void removenotused_scredges(bScreen *sc) /* sets flags when edge is used in area */ sa= sc->areabase.first; - while(sa) { + while (sa) { se= screen_findedge(sc, sa->v1, sa->v2); - if(se==NULL) printf("error: area %d edge 1 doesn't exist\n", a); + if (se==NULL) printf("error: area %d edge 1 doesn't exist\n", a); else se->flag= 1; se= screen_findedge(sc, sa->v2, sa->v3); - if(se==NULL) printf("error: area %d edge 2 doesn't exist\n", a); + if (se==NULL) printf("error: area %d edge 2 doesn't exist\n", a); else se->flag= 1; se= screen_findedge(sc, sa->v3, sa->v4); - if(se==NULL) printf("error: area %d edge 3 doesn't exist\n", a); + if (se==NULL) printf("error: area %d edge 3 doesn't exist\n", a); else se->flag= 1; se= screen_findedge(sc, sa->v4, sa->v1); - if(se==NULL) printf("error: area %d edge 4 doesn't exist\n", a); + if (se==NULL) printf("error: area %d edge 4 doesn't exist\n", a); else se->flag= 1; sa= sa->next; a++; } se= sc->edgebase.first; - while(se) { + while (se) { sen= se->next; - if(se->flag==0) { + if (se->flag==0) { BLI_remlink(&sc->edgebase, se); MEM_freeN(se); } @@ -320,18 +320,18 @@ static short testsplitpoint(ScrArea *sa, char dir, float fac) short x, y; // area big enough? - if(dir=='v' && (sa->v4->vec.x- sa->v1->vec.x <= 2*AREAMINX)) return 0; - if(dir=='h' && (sa->v2->vec.y- sa->v1->vec.y <= 2*AREAMINY)) return 0; + if (dir=='v' && (sa->v4->vec.x- sa->v1->vec.x <= 2*AREAMINX)) return 0; + if (dir=='h' && (sa->v2->vec.y- sa->v1->vec.y <= 2*AREAMINY)) return 0; // to be sure CLAMP(fac, 0.0f, 1.0f); - if(dir=='h') { + if (dir=='h') { y= sa->v1->vec.y+ fac*(sa->v2->vec.y- sa->v1->vec.y); - if(y- sa->v1->vec.y < AREAMINY) + if (y- sa->v1->vec.y < AREAMINY) y= sa->v1->vec.y+ AREAMINY; - else if(sa->v2->vec.y- y < AREAMINY) + else if (sa->v2->vec.y- y < AREAMINY) y= sa->v2->vec.y- AREAMINY; else y-= (y % AREAGRID); @@ -340,9 +340,9 @@ static short testsplitpoint(ScrArea *sa, char dir, float fac) else { x= sa->v1->vec.x+ fac*(sa->v4->vec.x- sa->v1->vec.x); - if(x- sa->v1->vec.x < AREAMINX) + if (x- sa->v1->vec.x < AREAMINX) x= sa->v1->vec.x+ AREAMINX; - else if(sa->v4->vec.x- x < AREAMINX) + else if (sa->v4->vec.x- x < AREAMINX) x= sa->v4->vec.x- AREAMINX; else x-= (x % AREAGRID); @@ -356,12 +356,12 @@ ScrArea *area_split(bScreen *sc, ScrArea *sa, char dir, float fac, int merge) ScrVert *sv1, *sv2; short split; - if(sa==NULL) return NULL; + if (sa==NULL) return NULL; split= testsplitpoint(sa, dir, fac); - if(split==0) return NULL; + if (split==0) return NULL; - if(dir=='h') { + if (dir=='h') { /* new vertices */ sv1= screen_addvert(sc, sa->v1->vec.x, split); sv2= screen_addvert(sc, sa->v4->vec.x, split); @@ -404,7 +404,7 @@ ScrArea *area_split(bScreen *sc, ScrArea *sa, char dir, float fac, int merge) } /* remove double vertices en edges */ - if(merge) + if (merge) removedouble_scrverts(sc); removedouble_scredges(sc); removenotused_scredges(sc); @@ -456,18 +456,18 @@ static void screen_copy(bScreen *to, bScreen *from) to->regionbase.first= to->regionbase.last= NULL; s2= to->vertbase.first; - for(s1= from->vertbase.first; s1; s1= s1->next, s2= s2->next) { + for (s1= from->vertbase.first; s1; s1= s1->next, s2= s2->next) { s1->newv= s2; } - for(se= to->edgebase.first; se; se= se->next) { + for (se= to->edgebase.first; se; se= se->next) { se->v1= se->v1->newv; se->v2= se->v2->newv; sortscrvert(&(se->v1), &(se->v2)); } saf= from->areabase.first; - for(sa= to->areabase.first; sa; sa= sa->next, saf= saf->next) { + for (sa= to->areabase.first; sa; sa= sa->next, saf= saf->next) { sa->v1= sa->v1->newv; sa->v2= sa->v2->newv; sa->v3= sa->v3->newv; @@ -482,7 +482,7 @@ static void screen_copy(bScreen *to, bScreen *from) } /* put at zero (needed?) */ - for(s1= from->vertbase.first; s1; s1= s1->next) + for (s1= from->vertbase.first; s1; s1= s1->next) s1->newv= NULL; } @@ -496,7 +496,7 @@ int area_getorientation(ScrArea *sa, ScrArea *sb) ScrVert *sav1, *sav2, *sav3, *sav4; ScrVert *sbv1, *sbv2, *sbv3, *sbv4; - if(sa==NULL || sb==NULL) return -1; + if (sa==NULL || sb==NULL) return -1; sav1= sa->v1; sav2= sa->v2; @@ -507,16 +507,16 @@ int area_getorientation(ScrArea *sa, ScrArea *sb) sbv3= sb->v3; sbv4= sb->v4; - if(sav1==sbv4 && sav2==sbv3) { /* sa to right of sb = W */ + if (sav1==sbv4 && sav2==sbv3) { /* sa to right of sb = W */ return 0; } - else if(sav2==sbv1 && sav3==sbv4) { /* sa to bottom of sb = N */ + else if (sav2==sbv1 && sav3==sbv4) { /* sa to bottom of sb = N */ return 1; } - else if(sav3==sbv2 && sav4==sbv1) { /* sa to left of sb = E */ + else if (sav3==sbv2 && sav4==sbv1) { /* sa to left of sb = E */ return 2; } - else if(sav1==sbv2 && sav4==sbv3) { /* sa on top of sb = S*/ + else if (sav1==sbv2 && sav4==sbv3) { /* sa on top of sb = S*/ return 3; } @@ -539,25 +539,25 @@ int screen_area_join(bContext *C, bScreen* scr, ScrArea *sa1, ScrArea *sa2) return 0; } - if(dir == 0) { + if (dir == 0) { sa1->v1= sa2->v1; sa1->v2= sa2->v2; screen_addedge(scr, sa1->v2, sa1->v3); screen_addedge(scr, sa1->v1, sa1->v4); } - else if(dir == 1) { + else if (dir == 1) { sa1->v2= sa2->v2; sa1->v3= sa2->v3; screen_addedge(scr, sa1->v1, sa1->v2); screen_addedge(scr, sa1->v3, sa1->v4); } - else if(dir == 2) { + else if (dir == 2) { sa1->v3= sa2->v3; sa1->v4= sa2->v4; screen_addedge(scr, sa1->v2, sa1->v3); screen_addedge(scr, sa1->v1, sa1->v4); } - else if(dir == 3) { + else if (dir == 3) { sa1->v1= sa2->v1; sa1->v4= sa2->v4; screen_addedge(scr, sa1->v1, sa1->v2); @@ -581,11 +581,11 @@ void select_connected_scredge(bScreen *sc, ScrEdge *edge) /* select connected, only in the right direction */ /* 'dir' is the direction of EDGE */ - if(edge->v1->vec.x==edge->v2->vec.x) dir= 'v'; + if (edge->v1->vec.x==edge->v2->vec.x) dir= 'v'; else dir= 'h'; sv= sc->vertbase.first; - while(sv) { + while (sv) { sv->flag = 0; sv= sv->next; } @@ -594,16 +594,16 @@ void select_connected_scredge(bScreen *sc, ScrEdge *edge) edge->v2->flag= 1; oneselected= 1; - while(oneselected) { + while (oneselected) { se= sc->edgebase.first; oneselected= 0; - while(se) { - if(se->v1->flag + se->v2->flag==1) { - if(dir=='h') if(se->v1->vec.y==se->v2->vec.y) { + while (se) { + if (se->v1->flag + se->v2->flag==1) { + if (dir=='h') if(se->v1->vec.y==se->v2->vec.y) { se->v1->flag= se->v2->flag= 1; oneselected= 1; } - if(dir=='v') if(se->v1->vec.x==se->v2->vec.x) { + if (dir=='v') if(se->v1->vec.x==se->v2->vec.x) { se->v1->flag= se->v2->flag= 1; oneselected= 1; } @@ -625,7 +625,7 @@ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey) min[0]= min[1]= 10000.0f; max[0]= max[1]= 0.0f; - for(sv= sc->vertbase.first; sv; sv= sv->next) { + for (sv= sc->vertbase.first; sv; sv= sv->next) { min[0]= MIN2(min[0], sv->vec.x); min[1]= MIN2(min[1], sv->vec.y); max[0]= MAX2(max[0], sv->vec.x); @@ -633,7 +633,7 @@ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey) } /* always make 0.0 left under */ - for(sv= sc->vertbase.first; sv; sv= sv->next) { + for (sv= sc->vertbase.first; sv; sv= sv->next) { sv->vec.x -= min[0]; sv->vec.y -= min[1]; } @@ -641,14 +641,14 @@ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey) sizex= max[0]-min[0]; sizey= max[1]-min[1]; - if(sizex!= winsizex || sizey!= winsizey) { + if (sizex!= winsizex || sizey!= winsizey) { facx= winsizex; facx/= (float)sizex; facy= winsizey; facy/= (float)sizey; /* make sure it fits! */ - for(sv= sc->vertbase.first; sv; sv= sv->next) { + for (sv= sc->vertbase.first; sv; sv= sv->next) { /* FIXME, this re-sizing logic is no good when re-sizing the window + redrawing [#24428] * need some way to store these as floats internally and re-apply from there. */ tempf= ((float)sv->vec.x)*facx; @@ -671,13 +671,13 @@ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey) /* ton: removed option now, it needs Context... */ /* make each window at least ED_area_headersize() high */ - for(sa= sc->areabase.first; sa; sa= sa->next) { + for (sa= sc->areabase.first; sa; sa= sa->next) { int headery= ED_area_headersize()+1; - if(sa->v1->vec.y+headery > sa->v2->vec.y) { + if (sa->v1->vec.y+headery > sa->v2->vec.y) { /* lower edge */ ScrEdge *se= screen_findedge(sc, sa->v4, sa->v1); - if(se && sa->v1!=sa->v2 ) { + if (se && sa->v1!=sa->v2 ) { int yval; select_connected_scredge(sc, se); @@ -685,10 +685,10 @@ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey) /* all selected vertices get the right offset */ yval= sa->v2->vec.y-headery; sv= sc->vertbase.first; - while(sv) { + while (sv) { /* if is a collapsed area */ - if(sv!=sa->v2 && sv!=sa->v3) { - if(sv->flag) sv->vec.y= yval; + if (sv!=sa->v2 && sv!=sa->v3) { + if (sv->flag) sv->vec.y= yval; } sv= sv->next; } @@ -714,7 +714,7 @@ static void draw_horizontal_join_shape(ScrArea *sa, char dir) float width = sa->v3->vec.x - sa->v1->vec.x; float height = sa->v3->vec.y - sa->v1->vec.y; - if(height<width) { + if (height<width) { h = height/8; w = height/4; } @@ -753,10 +753,10 @@ static void draw_horizontal_join_shape(ScrArea *sa, char dir) points[9].x = sa->v4->vec.x; points[9].y = sa->v4->vec.y + height/2 + h; - if(dir=='l') { + if (dir=='l') { /* when direction is left, then we flip direction of arrow */ float cx = sa->v1->vec.x + width; - for(i=0;i<10;i++) { + for (i=0;i<10;i++) { points[i].x -= cx; points[i].x = -points[i].x; points[i].x += sa->v1->vec.x; @@ -764,11 +764,11 @@ static void draw_horizontal_join_shape(ScrArea *sa, char dir) } glBegin(GL_POLYGON); - for(i=0;i<5;i++) + for (i=0;i<5;i++) glVertex2f(points[i].x, points[i].y); glEnd(); glBegin(GL_POLYGON); - for(i=4;i<8;i++) + for (i=4;i<8;i++) glVertex2f(points[i].x, points[i].y); glVertex2f(points[0].x, points[0].y); glEnd(); @@ -786,7 +786,7 @@ static void draw_vertical_join_shape(ScrArea *sa, char dir) float width = sa->v3->vec.x - sa->v1->vec.x; float height = sa->v3->vec.y - sa->v1->vec.y; - if(height<width) { + if (height<width) { h = height/4; w = height/8; } @@ -825,10 +825,10 @@ static void draw_vertical_join_shape(ScrArea *sa, char dir) points[9].x = sa->v1->vec.x + width/2 + w; points[9].y = sa->v1->vec.y; - if(dir=='u') { + if (dir=='u') { /* when direction is up, then we flip direction of arrow */ float cy = sa->v1->vec.y + height; - for(i=0;i<10;i++) { + for (i=0;i<10;i++) { points[i].y -= cy; points[i].y = -points[i].y; points[i].y += sa->v1->vec.y; @@ -836,11 +836,11 @@ static void draw_vertical_join_shape(ScrArea *sa, char dir) } glBegin(GL_POLYGON); - for(i=0;i<5;i++) + for (i=0;i<5;i++) glVertex2f(points[i].x, points[i].y); glEnd(); glBegin(GL_POLYGON); - for(i=4;i<8;i++) + for (i=4;i<8;i++) glVertex2f(points[i].x, points[i].y); glVertex2f(points[0].x, points[0].y); glEnd(); @@ -852,7 +852,7 @@ static void draw_vertical_join_shape(ScrArea *sa, char dir) /* draw join shape due to direction of joining */ static void draw_join_shape(ScrArea *sa, char dir) { - if(dir=='u' || dir=='d') + if (dir=='u' || dir=='d') draw_vertical_join_shape(sa, dir); else draw_horizontal_join_shape(sa, dir); @@ -883,19 +883,19 @@ static void scrarea_draw_shape_light(ScrArea *sa, char UNUSED(dir)) static void drawscredge_area_draw(int sizex, int sizey, short x1, short y1, short x2, short y2, short a) { /* right border area */ - if(x2<sizex-1) + if (x2<sizex-1) sdrawline(x2+a, y1, x2+a, y2); /* left border area */ - if(x1>0) /* otherwise it draws the emboss of window over */ + if (x1>0) /* otherwise it draws the emboss of window over */ sdrawline(x1+a, y1, x1+a, y2); /* top border area */ - if(y2<sizey-1) + if (y2<sizey-1) sdrawline(x1, y2+a, x2, y2+a); /* bottom border area */ - if(y1>0) + if (y1>0) sdrawline(x1, y1+a, x2, y1+a); } @@ -911,10 +911,10 @@ static void drawscredge_area(ScrArea *sa, int sizex, int sizey, int center) rt= 0; // CLAMPIS(G.rt, 0, 16); - if(center==0) { + if (center==0) { cpack(0x505050); - for(a=-rt; a<=rt; a++) - if(a!=0) + for (a=-rt; a<=rt; a++) + if (a!=0) drawscredge_area_draw(sizex, sizey, x1, y1, x2, y2, a); } else { @@ -929,7 +929,7 @@ bScreen *ED_screen_duplicate(wmWindow *win, bScreen *sc) { bScreen *newsc; - if(sc->full != SCREENNORMAL) return NULL; /* XXX handle this case! */ + if (sc->full != SCREENNORMAL) return NULL; /* XXX handle this case! */ /* make new empty screen: */ newsc= ED_screen_add(win, sc->scene, sc->id.name+2); @@ -944,11 +944,11 @@ static void region_cursor_set(wmWindow *win, int swinid) { ScrArea *sa= win->screen->areabase.first; - for(;sa; sa= sa->next) { + for (;sa; sa= sa->next) { ARegion *ar= sa->regionbase.first; - for(;ar; ar= ar->next) { - if(ar->swinid == swinid) { - if(ar->type && ar->type->cursor) + for (;ar; ar= ar->next) { + if (ar->swinid == swinid) { + if (ar->type && ar->type->cursor) ar->type->cursor(win, sa, ar); else WM_cursor_set(win, CURSOR_STD); @@ -965,20 +965,20 @@ void ED_screen_do_listen(bContext *C, wmNotifier *note) /* generic notes */ switch(note->category) { case NC_WM: - if(note->data==ND_FILEREAD) + if (note->data==ND_FILEREAD) win->screen->do_draw= 1; break; case NC_WINDOW: win->screen->do_draw= 1; break; case NC_SCREEN: - if(note->data==ND_SUBWINACTIVE) + if (note->data==ND_SUBWINACTIVE) uiFreeActiveButtons(C, win->screen); - if(note->action==NA_EDITED) + if (note->action==NA_EDITED) win->screen->do_draw= win->screen->do_refresh= 1; break; case NC_SCENE: - if(note->data==ND_MODE) + if (note->data==ND_MODE) region_cursor_set(win, note->swinid); break; } @@ -996,13 +996,13 @@ void ED_screen_draw(wmWindow *win) wmSubWindowSet(win, win->screen->mainwin); - for(sa= win->screen->areabase.first; sa; sa= sa->next) { + for (sa= win->screen->areabase.first; sa; sa= sa->next) { if (sa->flag & AREA_FLAG_DRAWJOINFROM) sa1 = sa; if (sa->flag & AREA_FLAG_DRAWJOINTO) sa2 = sa; if (sa->flag & (AREA_FLAG_DRAWSPLIT_H|AREA_FLAG_DRAWSPLIT_V)) sa3 = sa; drawscredge_area(sa, win->sizex, win->sizey, 0); } - for(sa= win->screen->areabase.first; sa; sa= sa->next) + for (sa= win->screen->areabase.first; sa; sa= sa->next) drawscredge_area(sa, win->sizex, win->sizey, 1); /* blended join arrow */ @@ -1033,11 +1033,11 @@ void ED_screen_draw(wmWindow *win) } /* splitpoint */ - if(sa3) { + if (sa3) { glEnable(GL_BLEND); glColor4ub(255, 255, 255, 100); - if(sa3->flag & AREA_FLAG_DRAWSPLIT_H) { + if (sa3->flag & AREA_FLAG_DRAWSPLIT_H) { sdrawline(sa3->totrct.xmin, win->eventstate->y, sa3->totrct.xmax, win->eventstate->y); glColor4ub(0, 0, 0, 100); sdrawline(sa3->totrct.xmin, win->eventstate->y+1, sa3->totrct.xmax, win->eventstate->y+1); @@ -1060,9 +1060,9 @@ static void screen_refresh_headersizes(void) const ListBase *lb= BKE_spacetypes_list(); SpaceType *st; - for(st= lb->first; st; st= st->next) { + for (st= lb->first; st; st= st->next) { ARegionType *art= BKE_regiontype_from_id(st, RGN_TYPE_HEADER); - if(art) art->prefsizey= ED_area_headersize(); + if (art) art->prefsizey= ED_area_headersize(); } } @@ -1082,7 +1082,7 @@ void ED_screen_refresh(wmWindowManager *wm, wmWindow *win) screen_test_scale(win->screen, win->sizex, win->sizey); - if(win->screen->mainwin==0) + if (win->screen->mainwin==0) win->screen->mainwin= wm_subwindow_open(win, &winrct); else wm_subwindow_position(win, win->screen->mainwin, &winrct); @@ -1090,18 +1090,18 @@ void ED_screen_refresh(wmWindowManager *wm, wmWindow *win) /* header size depends on DPI, let's verify */ screen_refresh_headersizes(); - for(sa= win->screen->areabase.first; sa; sa= sa->next) { + for (sa= win->screen->areabase.first; sa; sa= sa->next) { /* set spacetype and region callbacks, calls init() */ /* sets subwindows for regions, adds handlers */ ED_area_initialize(wm, win, sa); } /* wake up animtimer */ - if(win->screen->animtimer) + if (win->screen->animtimer) WM_event_timer_sleep(wm, win, win->screen->animtimer, 0); } - if(G.f & G_DEBUG) printf("set screen\n"); + if (G.f & G_DEBUG) printf("set screen\n"); win->screen->do_refresh= 0; win->screen->context= ed_screen_context; @@ -1112,9 +1112,9 @@ void ED_screens_initialize(wmWindowManager *wm) { wmWindow *win; - for(win= wm->windows.first; win; win= win->next) { + for (win= wm->windows.first; win; win= win->next) { - if(win->screen==NULL) + if (win->screen==NULL) win->screen= G.main->screen.first; ED_screen_refresh(wm, win); @@ -1130,11 +1130,11 @@ void ED_region_exit(bContext *C, ARegion *ar) CTX_wm_region_set(C, ar); WM_event_remove_handlers(C, &ar->handlers); - if(ar->swinid) + if (ar->swinid) wm_subwindow_close(CTX_wm_window(C), ar->swinid); ar->swinid= 0; - if(ar->headerstr) + if (ar->headerstr) MEM_freeN(ar->headerstr); ar->headerstr= NULL; @@ -1148,13 +1148,13 @@ void ED_area_exit(bContext *C, ScrArea *sa) if (sa->spacetype == SPACE_FILE) { SpaceLink *sl= sa->spacedata.first; - if(sl && sl->spacetype == SPACE_FILE) { + if (sl && sl->spacetype == SPACE_FILE) { ED_fileselect_exit(C, (SpaceFile *)sl); } } CTX_wm_area_set(C, sa); - for(ar= sa->regionbase.first; ar; ar= ar->next) + for (ar= sa->regionbase.first; ar; ar= ar->next) ED_region_exit(C, ar); WM_event_remove_handlers(C, &sa->handlers); @@ -1170,19 +1170,19 @@ void ED_screen_exit(bContext *C, wmWindow *window, bScreen *screen) CTX_wm_window_set(C, window); - if(screen->animtimer) + if (screen->animtimer) WM_event_remove_timer(wm, window, screen->animtimer); screen->animtimer= NULL; - if(screen->mainwin) + if (screen->mainwin) wm_subwindow_close(window, screen->mainwin); screen->mainwin= 0; screen->subwinactive= 0; - for(ar= screen->regionbase.first; ar; ar= ar->next) + for (ar= screen->regionbase.first; ar; ar= ar->next) ED_region_exit(C, ar); - for(sa= screen->areabase.first; sa; sa= sa->next) + for (sa= screen->areabase.first; sa; sa= sa->next) ED_area_exit(C, sa); /* mark it available for use for other windows */ @@ -1191,7 +1191,8 @@ void ED_screen_exit(bContext *C, wmWindow *window, bScreen *screen) if (prevwin->screen->temp == 0) { /* use previous window if possible */ CTX_wm_window_set(C, prevwin); - } else { + } + else { /* none otherwise */ CTX_wm_window_set(C, NULL); } @@ -1206,15 +1207,15 @@ static void screen_cursor_set(wmWindow *win, wmEvent *event) AZone *az= NULL; ScrArea *sa; - for(sa= win->screen->areabase.first; sa; sa= sa->next) - if((az=is_in_area_actionzone(sa, event->x, event->y))) + for (sa= win->screen->areabase.first; sa; sa= sa->next) + if ((az=is_in_area_actionzone(sa, event->x, event->y))) break; - if(sa) { - if(az->type==AZONE_AREA) + if (sa) { + if (az->type==AZONE_AREA) WM_cursor_set(win, CURSOR_EDIT); - else if(az->type==AZONE_REGION) { - if(az->edge == AE_LEFT_TO_TOPRIGHT || az->edge == AE_RIGHT_TO_TOPLEFT) + else if (az->type==AZONE_REGION) { + if (az->edge == AE_LEFT_TO_TOPRIGHT || az->edge == AE_RIGHT_TO_TOPLEFT) WM_cursor_set(win, CURSOR_X_MOVE); else WM_cursor_set(win, CURSOR_Y_MOVE); @@ -1224,7 +1225,7 @@ static void screen_cursor_set(wmWindow *win, wmEvent *event) ScrEdge *actedge= screen_find_active_scredge(win->screen, event->x, event->y); if (actedge) { - if(scredge_is_horizontal(actedge)) + if (scredge_is_horizontal(actedge)) WM_cursor_set(win, CURSOR_Y_MOVE); else WM_cursor_set(win, CURSOR_X_MOVE); @@ -1241,21 +1242,21 @@ void ED_screen_set_subwinactive(bContext *C, wmEvent *event) { wmWindow *win= CTX_wm_window(C); - if(win->screen) { + if (win->screen) { bScreen *scr= win->screen; ScrArea *sa; ARegion *ar; int oldswin= scr->subwinactive; - for(sa= scr->areabase.first; sa; sa= sa->next) { - if(event->x > sa->totrct.xmin && event->x < sa->totrct.xmax) - if(event->y > sa->totrct.ymin && event->y < sa->totrct.ymax) - if(NULL==is_in_area_actionzone(sa, event->x, event->y)) + for (sa= scr->areabase.first; sa; sa= sa->next) { + if (event->x > sa->totrct.xmin && event->x < sa->totrct.xmax) + if (event->y > sa->totrct.ymin && event->y < sa->totrct.ymax) + if (NULL==is_in_area_actionzone(sa, event->x, event->y)) break; } - if(sa) { - for(ar= sa->regionbase.first; ar; ar= ar->next) { - if(BLI_in_rcti(&ar->winrct, event->x, event->y)) + if (sa) { + for (ar= sa->regionbase.first; ar; ar= ar->next) { + if (BLI_in_rcti(&ar->winrct, event->x, event->y)) scr->subwinactive= ar->swinid; } } @@ -1263,28 +1264,28 @@ void ED_screen_set_subwinactive(bContext *C, wmEvent *event) scr->subwinactive= scr->mainwin; /* check for redraw headers */ - if(oldswin!=scr->subwinactive) { + if (oldswin!=scr->subwinactive) { - for(sa= scr->areabase.first; sa; sa= sa->next) { + for (sa= scr->areabase.first; sa; sa= sa->next) { int do_draw= 0; - for(ar= sa->regionbase.first; ar; ar= ar->next) - if(ar->swinid==oldswin || ar->swinid==scr->subwinactive) + for (ar= sa->regionbase.first; ar; ar= ar->next) + if (ar->swinid==oldswin || ar->swinid==scr->subwinactive) do_draw= 1; - if(do_draw) { - for(ar= sa->regionbase.first; ar; ar= ar->next) - if(ar->regiontype==RGN_TYPE_HEADER) + if (do_draw) { + for (ar= sa->regionbase.first; ar; ar= ar->next) + if (ar->regiontype==RGN_TYPE_HEADER) ED_region_tag_redraw(ar); } } } /* cursors, for time being set always on edges, otherwise aregion doesnt switch */ - if(scr->subwinactive==scr->mainwin) { + if (scr->subwinactive==scr->mainwin) { screen_cursor_set(win, event); } - else if(oldswin!=scr->subwinactive) { + else if (oldswin!=scr->subwinactive) { region_cursor_set(win, scr->subwinactive); WM_event_add_notifier(C, NC_SCREEN|ND_SUBWINACTIVE, scr); } @@ -1297,15 +1298,15 @@ int ED_screen_area_active(const bContext *C) bScreen *sc= CTX_wm_screen(C); ScrArea *sa= CTX_wm_area(C); - if(win && sc && sa) { + if (win && sc && sa) { AZone *az= is_in_area_actionzone(sa, win->eventstate->x, win->eventstate->y); ARegion *ar; if (az && az->type == AZONE_REGION) return 1; - for(ar= sa->regionbase.first; ar; ar= ar->next) - if(ar->swinid == sc->subwinactive) + for (ar= sa->regionbase.first; ar; ar= ar->next) + if (ar->swinid == sc->subwinactive) return 1; } return 0; @@ -1321,21 +1322,21 @@ void ED_screen_set(bContext *C, bScreen *sc) ID *id; /* validate screen, it's called with notifier reference */ - for(id= CTX_data_main(C)->screen.first; id; id= id->next) - if(sc == (bScreen *)id) + for (id= CTX_data_main(C)->screen.first; id; id= id->next) + if (sc == (bScreen *)id) break; - if(id==NULL) + if (id==NULL) return; /* check for valid winid */ - if(sc->winid!=0 && sc->winid!=win->winid) + if (sc->winid!=0 && sc->winid!=win->winid) return; - if(sc->full) { /* find associated full */ + if (sc->full) { /* find associated full */ bScreen *sc1; - for(sc1= CTX_data_main(C)->screen.first; sc1; sc1= sc1->id.next) { + for (sc1= CTX_data_main(C)->screen.first; sc1; sc1= sc1->id.next) { ScrArea *sa= sc1->areabase.first; - if(sa->full==sc) { + if (sa->full==sc) { sc= sc1; break; } @@ -1347,13 +1348,13 @@ void ED_screen_set(bContext *C, bScreen *sc) ScrArea *sa; /* remove handlers referencing areas in old screen */ - for(sa = oldscreen->areabase.first; sa; sa = sa->next) { + for (sa = oldscreen->areabase.first; sa; sa = sa->next) { WM_event_remove_area_handler(&win->modalhandlers, sa); } /* we put timer to sleep, so screen_exit has to think there's no timer */ oldscreen->animtimer= NULL; - if(wt) + if (wt) WM_event_timer_sleep(wm, win, wt, 1); ED_screen_exit(C, win, oldscreen); @@ -1378,8 +1379,8 @@ static int ed_screen_used(wmWindowManager *wm, bScreen *sc) { wmWindow *win; - for(win=wm->windows.first; win; win=win->next) - if(win->screen == sc) + for (win=wm->windows.first; win; win=win->next) + if (win->screen == sc) return 1; return 0; @@ -1404,22 +1405,22 @@ void ED_screen_delete(bContext *C, bScreen *sc) * long as we are able to find a screen that is unused, we * can safely assume ours is not in use anywhere an delete it */ - for(newsc= sc->id.prev; newsc; newsc=newsc->id.prev) - if(!ed_screen_used(wm, newsc)) + for (newsc= sc->id.prev; newsc; newsc=newsc->id.prev) + if (!ed_screen_used(wm, newsc)) break; - if(!newsc) { - for(newsc= sc->id.next; newsc; newsc=newsc->id.next) - if(!ed_screen_used(wm, newsc)) + if (!newsc) { + for (newsc= sc->id.next; newsc; newsc=newsc->id.next) + if (!ed_screen_used(wm, newsc)) break; } - if(!newsc) + if (!newsc) return; ED_screen_set(C, newsc); - if(delete && win->screen != sc) + if (delete && win->screen != sc) free_libblock(&bmain->screen, sc); } @@ -1429,19 +1430,19 @@ void ED_screen_set_scene(bContext *C, bScreen *screen, Scene *scene) Main *bmain= CTX_data_main(C); bScreen *sc; - if(screen == NULL) + if (screen == NULL) return; - if(ed_screen_used(CTX_wm_manager(C), screen)) + if (ed_screen_used(CTX_wm_manager(C), screen)) ED_object_exit_editmode(C, EM_FREEDATA|EM_DO_UNDO); - for(sc= CTX_data_main(C)->screen.first; sc; sc= sc->id.next) { - if((U.flag & USER_SCENEGLOBAL) || sc==screen) { + for (sc= CTX_data_main(C)->screen.first; sc; sc= sc->id.next) { + if ((U.flag & USER_SCENEGLOBAL) || sc==screen) { - if(scene != sc->scene) { + if (scene != sc->scene) { /* all areas endlocalview */ // XXX ScrArea *sa= sc->areabase.first; - // while(sa) { + // while (sa) { // endlocalview(sa); // sa= sa->next; // } @@ -1454,13 +1455,13 @@ void ED_screen_set_scene(bContext *C, bScreen *screen, Scene *scene) // copy_view3d_lock(0); /* space.c */ /* are there cameras in the views that are not in the scene? */ - for(sc= CTX_data_main(C)->screen.first; sc; sc= sc->id.next) { - if( (U.flag & USER_SCENEGLOBAL) || sc==screen) { + for (sc= CTX_data_main(C)->screen.first; sc; sc= sc->id.next) { + if ( (U.flag & USER_SCENEGLOBAL) || sc==screen) { ScrArea *sa= sc->areabase.first; - while(sa) { + while (sa) { SpaceLink *sl= sa->spacedata.first; - while(sl) { - if(sl->spacetype==SPACE_VIEW3D) { + while (sl) { + if (sl->spacetype==SPACE_VIEW3D) { View3D *v3d= (View3D*) sl; BKE_screen_view3d_sync(v3d, scene); @@ -1470,11 +1471,11 @@ void ED_screen_set_scene(bContext *C, bScreen *screen, Scene *scene) // XXX if (sc==curscreen) handle_view3d_lock(); if (!v3d->camera) { ARegion *ar; - for(ar=v3d->regionbase.first; ar; ar= ar->next) { - if(ar->regiontype == RGN_TYPE_WINDOW) { + for (ar=v3d->regionbase.first; ar; ar= ar->next) { + if (ar->regiontype == RGN_TYPE_WINDOW) { RegionView3D *rv3d= ar->regiondata; - if(rv3d->persp==RV3D_CAMOB) + if (rv3d->persp==RV3D_CAMOB) rv3d->persp= RV3D_PERSP; } } @@ -1505,9 +1506,9 @@ void ED_screen_delete_scene(bContext *C, Scene *scene) Main *bmain= CTX_data_main(C); Scene *newscene; - if(scene->id.prev) + if (scene->id.prev) newscene= scene->id.prev; - else if(scene->id.next) + else if (scene->id.next) newscene= scene->id.next; else return; @@ -1523,11 +1524,11 @@ ScrArea *ED_screen_full_newspace(bContext *C, ScrArea *sa, int type) bScreen *screen= CTX_wm_screen(C); ScrArea *newsa= NULL; - if(!sa || sa->full==NULL) { + if (!sa || sa->full==NULL) { newsa= ED_screen_full_toggle(C, win, sa); } - if(!newsa) { + if (!newsa) { if (sa->full) { /* if this has been called from the temporary info header generated in * temp fullscreen layouts, find the correct fullscreen area to change @@ -1536,8 +1537,10 @@ ScrArea *ED_screen_full_newspace(bContext *C, ScrArea *sa, int type) if (!(sa->flag & AREA_TEMP_INFO)) break; } - } else - newsa= sa; + } + else { + newsa = sa; + } } ED_area_newspace(C, newsa, type); @@ -1551,7 +1554,7 @@ void ED_screen_full_prevspace(bContext *C, ScrArea *sa) ED_area_prevspace(C, sa); - if(sa->full) + if (sa->full) ED_screen_full_toggle(C, win, sa); } @@ -1584,10 +1587,13 @@ void ED_screen_full_restore(bContext *C, ScrArea *sa) sima->flag &= ~SI_FULLWINDOW; ED_screen_full_prevspace(C, sa); } - } else if (sl->spacetype == SPACE_FILE) { + } + else if (sl->spacetype == SPACE_FILE) { ED_screen_full_prevspace(C, sa); - } else + } + else { ED_screen_full_toggle(C, win, sa); + } } /* otherwise just tile the area again */ else { @@ -1601,18 +1607,18 @@ ScrArea *ED_screen_full_toggle(bContext *C, wmWindow *win, ScrArea *sa) bScreen *sc, *oldscreen; ARegion *ar; - if(sa) { + if (sa) { /* ensure we don't have a button active anymore, can crash when * switching screens with tooltip open because region and tooltip * are no longer in the same screen */ - for(ar=sa->regionbase.first; ar; ar=ar->next) + for (ar=sa->regionbase.first; ar; ar=ar->next) uiFreeBlocks(C, &ar->uiblocks); /* prevent hanging header prints */ ED_area_headerprint(sa, NULL); } - if(sa && sa->full) { + if (sa && sa->full) { ScrArea *old; /*short fulltype;*/ /*UNUSED*/ @@ -1625,9 +1631,9 @@ ScrArea *ED_screen_full_toggle(bContext *C, wmWindow *win, ScrArea *sa) /* removed: SCREENAUTOPLAY exception here */ /* find old area */ - for(old= sc->areabase.first; old; old= old->next) - if(old->full) break; - if(old==NULL) { + for (old= sc->areabase.first; old; old= old->next) + if (old->full) break; + if (old==NULL) { if (G.f & G_DEBUG) printf("something wrong in areafullscreen\n"); return NULL; @@ -1656,7 +1662,7 @@ ScrArea *ED_screen_full_toggle(bContext *C, wmWindow *win, ScrArea *sa) /* nothing wrong with having only 1 area, as far as I can see... * is there only 1 area? */ #if 0 - if(oldscreen->areabase.first==oldscreen->areabase.last) + if (oldscreen->areabase.first==oldscreen->areabase.last) return NULL; #endif @@ -1675,7 +1681,7 @@ ScrArea *ED_screen_full_toggle(bContext *C, wmWindow *win, ScrArea *sa) /* use random area when we have no active one, e.g. when the * mouse is outside of the window and we open a file browser */ - if(!sa) + if (!sa) sa= oldscreen->areabase.first; /* copy area */ @@ -1732,11 +1738,11 @@ void ED_screen_animation_timer(bContext *C, int redraws, int refresh, int sync, wmWindow *win= CTX_wm_window(C); Scene *scene= CTX_data_scene(C); - if(screen->animtimer) + if (screen->animtimer) WM_event_remove_timer(wm, win, screen->animtimer); screen->animtimer= NULL; - if(enable) { + if (enable) { ScreenAnimData *sad= MEM_callocN(sizeof(ScreenAnimData), "ScreenAnimData"); screen->animtimer= WM_event_add_timer(wm, win, TIMER0, (1.0/FPS)); @@ -1744,7 +1750,7 @@ void ED_screen_animation_timer(bContext *C, int redraws, int refresh, int sync, sad->ar= CTX_wm_region(C); /* if startframe is larger than current frame, we put currentframe on startframe. * note: first frame then is not drawn! (ton) */ - if(scene->r.sfra > scene->r.cfra) { + if (scene->r.sfra > scene->r.cfra) { sad->sfra= scene->r.cfra; scene->r.cfra= scene->r.sfra; } @@ -1769,12 +1775,12 @@ static ARegion *time_top_left_3dwindow(bScreen *screen) ScrArea *sa; int min= 10000; - for(sa= screen->areabase.first; sa; sa= sa->next) { - if(sa->spacetype==SPACE_VIEW3D) { + for (sa= screen->areabase.first; sa; sa= sa->next) { + if (sa->spacetype==SPACE_VIEW3D) { ARegion *ar; - for(ar= sa->regionbase.first; ar; ar= ar->next) { - if(ar->regiontype==RGN_TYPE_WINDOW) { - if(ar->winrct.xmin - ar->winrct.ymin < min) { + for (ar= sa->regionbase.first; ar; ar= ar->next) { + if (ar->regiontype==RGN_TYPE_WINDOW) { + if (ar->winrct.xmin - ar->winrct.ymin < min) { aret= ar; min= ar->winrct.xmin - ar->winrct.ymin; } @@ -1788,14 +1794,14 @@ static ARegion *time_top_left_3dwindow(bScreen *screen) void ED_screen_animation_timer_update(bScreen *screen, int redraws, int refresh) { - if(screen && screen->animtimer) { + if (screen && screen->animtimer) { wmTimer *wt= screen->animtimer; ScreenAnimData *sad= wt->customdata; sad->redraws= redraws; sad->refresh= refresh; sad->ar= NULL; - if(redraws & TIME_REGION) + if (redraws & TIME_REGION) sad->ar= time_top_left_3dwindow(screen); } } @@ -1806,11 +1812,11 @@ void ED_update_for_newframe(Main *bmain, Scene *scene, bScreen *screen, int UNUS { #ifdef DURIAN_CAMERA_SWITCH void *camera= scene_camera_switch_find(scene); - if(camera && scene->camera != camera) { + if (camera && scene->camera != camera) { bScreen *sc; scene->camera= camera; /* are there cameras in the views that are not in the scene? */ - for(sc= bmain->screen.first; sc; sc= sc->id.next) { + for (sc= bmain->screen.first; sc; sc= sc->id.next) { BKE_screen_view3d_scene_sync(sc); } } @@ -1838,13 +1844,13 @@ void ED_update_for_newframe(Main *bmain, Scene *scene, bScreen *screen, int UNUS //BIF_image_update_frame(); /* composite */ - if(scene->use_nodes && scene->nodetree) + if (scene->use_nodes && scene->nodetree) ntreeCompositTagAnimated(scene->nodetree); /* update animated texture nodes */ { Tex *tex; - for(tex= bmain->tex.first; tex; tex= tex->id.next) + for (tex= bmain->tex.first; tex; tex= tex->id.next) if (tex->use_nodes && tex->nodetree) { ntreeTexTagAnimated(tex->nodetree); } diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 00915be9758..d6a74cc19ce 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -89,42 +89,42 @@ int ED_operator_regionactive(bContext *C) { - if(CTX_wm_window(C)==NULL) return 0; - if(CTX_wm_screen(C)==NULL) return 0; - if(CTX_wm_region(C)==NULL) return 0; + if (CTX_wm_window(C)==NULL) return 0; + if (CTX_wm_screen(C)==NULL) return 0; + if (CTX_wm_region(C)==NULL) return 0; return 1; } int ED_operator_areaactive(bContext *C) { - if(CTX_wm_window(C)==NULL) return 0; - if(CTX_wm_screen(C)==NULL) return 0; - if(CTX_wm_area(C)==NULL) return 0; + if (CTX_wm_window(C)==NULL) return 0; + if (CTX_wm_screen(C)==NULL) return 0; + if (CTX_wm_area(C)==NULL) return 0; return 1; } int ED_operator_screenactive(bContext *C) { - if(CTX_wm_window(C)==NULL) return 0; - if(CTX_wm_screen(C)==NULL) return 0; + if (CTX_wm_window(C)==NULL) return 0; + if (CTX_wm_screen(C)==NULL) return 0; return 1; } /* XXX added this to prevent anim state to change during renders */ static int ED_operator_screenactive_norender(bContext *C) { - if(G.rendering) return 0; - if(CTX_wm_window(C)==NULL) return 0; - if(CTX_wm_screen(C)==NULL) return 0; + if (G.rendering) return 0; + if (CTX_wm_window(C)==NULL) return 0; + if (CTX_wm_screen(C)==NULL) return 0; return 1; } static int screen_active_editable(bContext *C) { - if(ED_operator_screenactive(C)) { + if (ED_operator_screenactive(C)) { /* no full window splitting allowed */ - if(CTX_wm_screen(C)->full != SCREENNORMAL) + if (CTX_wm_screen(C)->full != SCREENNORMAL) return 0; return 1; } @@ -134,8 +134,8 @@ static int screen_active_editable(bContext *C) /* when mouse is over area-edge */ int ED_operator_screen_mainwinactive(bContext *C) { - if(CTX_wm_window(C)==NULL) return 0; - if(CTX_wm_screen(C)==NULL) return 0; + if (CTX_wm_window(C)==NULL) return 0; + if (CTX_wm_screen(C)==NULL) return 0; if (CTX_wm_screen(C)->subwinactive!=CTX_wm_screen(C)->mainwin) return 0; return 1; } @@ -143,7 +143,7 @@ int ED_operator_screen_mainwinactive(bContext *C) int ED_operator_scene_editable(bContext *C) { Scene *scene= CTX_data_scene(C); - if(scene && scene->id.lib==NULL) + if (scene && scene->id.lib==NULL) return 1; return 0; } @@ -153,13 +153,13 @@ int ED_operator_objectmode(bContext *C) Scene *scene= CTX_data_scene(C); Object *obact= CTX_data_active_object(C); - if(scene==NULL || scene->id.lib) + if (scene==NULL || scene->id.lib) return 0; - if( CTX_data_edit_object(C) ) + if ( CTX_data_edit_object(C) ) return 0; /* add a check for ob->mode too? */ - if(obact && obact->mode) + if (obact && obact->mode) return 0; return 1; @@ -168,7 +168,7 @@ int ED_operator_objectmode(bContext *C) static int ed_spacetype_test(bContext *C, int type) { - if(ED_operator_areaactive(C)) { + if (ED_operator_areaactive(C)) { SpaceLink *sl= (SpaceLink *)CTX_wm_space_data(C); return sl && (sl->spacetype == type); } @@ -182,7 +182,7 @@ int ED_operator_view3d_active(bContext *C) int ED_operator_region_view3d_active(bContext *C) { - if(CTX_wm_region_view3d(C)) + if (CTX_wm_region_view3d(C)) return TRUE; CTX_wm_operator_poll_msg_set(C, "expected a view3d region"); @@ -192,7 +192,7 @@ int ED_operator_region_view3d_active(bContext *C) /* generic for any view2d which uses anim_ops */ int ED_operator_animview_active(bContext *C) { - if(ED_operator_areaactive(C)) { + if (ED_operator_areaactive(C)) { SpaceLink *sl= (SpaceLink *)CTX_wm_space_data(C); if (sl && (ELEM5(sl->spacetype, SPACE_SEQ, SPACE_ACTION, SPACE_NLA, SPACE_IPO, SPACE_TIME))) return TRUE; @@ -214,10 +214,10 @@ int ED_operator_outliner_active(bContext *C) int ED_operator_outliner_active_no_editobject(bContext *C) { - if(ed_spacetype_test(C, SPACE_OUTLINER)) { + if (ed_spacetype_test(C, SPACE_OUTLINER)) { Object *ob = ED_object_active_context(C); Object *obedit= CTX_data_edit_object(C); - if(ob && ob == obedit) + if (ob && ob == obedit) return 0; else return 1; @@ -244,7 +244,7 @@ int ED_operator_node_active(bContext *C) { SpaceNode *snode= CTX_wm_space_node(C); - if(snode && snode->edittree) + if (snode && snode->edittree) return 1; return 0; @@ -314,7 +314,7 @@ int ED_operator_object_active_editable_font(bContext *C) int ED_operator_editmesh(bContext *C) { Object *obedit= CTX_data_edit_object(C); - if(obedit && obedit->type==OB_MESH) + if (obedit && obedit->type==OB_MESH) return NULL != BMEdit_FromObject(obedit); return 0; } @@ -326,7 +326,7 @@ int ED_operator_editmesh_view3d(bContext *C) int ED_operator_editmesh_region_view3d(bContext *C) { - if(ED_operator_editmesh(C) && CTX_wm_region_view3d(C)) + if (ED_operator_editmesh(C) && CTX_wm_region_view3d(C)) return 1; CTX_wm_operator_poll_msg_set(C, "expected a view3d region & editmesh"); @@ -336,7 +336,7 @@ int ED_operator_editmesh_region_view3d(bContext *C) int ED_operator_editarmature(bContext *C) { Object *obedit= CTX_data_edit_object(C); - if(obedit && obedit->type==OB_ARMATURE) + if (obedit && obedit->type==OB_ARMATURE) return NULL != ((bArmature *)obedit->data)->edbo; return 0; } @@ -347,8 +347,8 @@ int ED_operator_posemode(bContext *C) if (obact && !(obact->mode & OB_MODE_EDIT)) { Object *obpose; - if((obpose= object_pose_armature_get(obact))) { - if((obact == obpose) || (obact->mode & OB_MODE_WEIGHT_PAINT)) { + if ((obpose= object_pose_armature_get(obact))) { + if ((obact == obpose) || (obact->mode & OB_MODE_WEIGHT_PAINT)) { return 1; } } @@ -370,11 +370,11 @@ int ED_operator_uvmap(bContext *C) Object *obedit = CTX_data_edit_object(C); BMEditMesh *em = NULL; - if(obedit && obedit->type == OB_MESH) { + if (obedit && obedit->type == OB_MESH) { em = BMEdit_FromObject(obedit); } - if(em && (em->bm->totface)) { + if (em && (em->bm->totface)) { return TRUE; } @@ -384,14 +384,14 @@ int ED_operator_uvmap(bContext *C) int ED_operator_editsurfcurve(bContext *C) { Object *obedit= CTX_data_edit_object(C); - if(obedit && ELEM(obedit->type, OB_CURVE, OB_SURF)) + if (obedit && ELEM(obedit->type, OB_CURVE, OB_SURF)) return NULL != ((Curve *)obedit->data)->editnurb; return 0; } int ED_operator_editsurfcurve_region_view3d(bContext *C) { - if(ED_operator_editsurfcurve(C) && CTX_wm_region_view3d(C)) + if (ED_operator_editsurfcurve(C) && CTX_wm_region_view3d(C)) return 1; CTX_wm_operator_poll_msg_set(C, "expected a view3d region & editcurve"); @@ -401,7 +401,7 @@ int ED_operator_editsurfcurve_region_view3d(bContext *C) int ED_operator_editcurve(bContext *C) { Object *obedit= CTX_data_edit_object(C); - if(obedit && obedit->type==OB_CURVE) + if (obedit && obedit->type==OB_CURVE) return NULL != ((Curve *)obedit->data)->editnurb; return 0; } @@ -409,7 +409,7 @@ int ED_operator_editcurve(bContext *C) int ED_operator_editcurve_3d(bContext *C) { Object *obedit= CTX_data_edit_object(C); - if(obedit && obedit->type==OB_CURVE) { + if (obedit && obedit->type==OB_CURVE) { Curve *cu= (Curve *)obedit->data; return (cu->flag&CU_3D) && (NULL != cu->editnurb); @@ -420,7 +420,7 @@ int ED_operator_editcurve_3d(bContext *C) int ED_operator_editsurf(bContext *C) { Object *obedit= CTX_data_edit_object(C); - if(obedit && obedit->type==OB_SURF) + if (obedit && obedit->type==OB_SURF) return NULL != ((Curve *)obedit->data)->editnurb; return 0; } @@ -428,7 +428,7 @@ int ED_operator_editsurf(bContext *C) int ED_operator_editfont(bContext *C) { Object *obedit= CTX_data_edit_object(C); - if(obedit && obedit->type==OB_FONT) + if (obedit && obedit->type==OB_FONT) return NULL != ((Curve *)obedit->data)->editfont; return 0; } @@ -436,7 +436,7 @@ int ED_operator_editfont(bContext *C) int ED_operator_editlattice(bContext *C) { Object *obedit= CTX_data_edit_object(C); - if(obedit && obedit->type==OB_LATTICE) + if (obedit && obedit->type==OB_LATTICE) return NULL != ((Lattice *)obedit->data)->editlatt; return 0; } @@ -444,7 +444,7 @@ int ED_operator_editlattice(bContext *C) int ED_operator_editmball(bContext *C) { Object *obedit= CTX_data_edit_object(C); - if(obedit && obedit->type==OB_MBALL) + if (obedit && obedit->type==OB_MBALL) return NULL != ((MetaBall *)obedit->data)->editelems; return 0; } @@ -484,8 +484,8 @@ static ScrArea *screen_areahascursor(bScreen *scr, int x, int y) { ScrArea *sa= NULL; sa= scr->areabase.first; - while(sa) { - if(BLI_in_rcti(&sa->totrct, x, y)) break; + while (sa) { + if (BLI_in_rcti(&sa->totrct, x, y)) break; sa= sa->next; } @@ -498,13 +498,13 @@ static int actionzone_area_poll(bContext *C) wmWindow *win= CTX_wm_window(C); ScrArea *sa= CTX_wm_area(C); - if(sa && win) { + if (sa && win) { AZone *az; int x= win->eventstate->x; int y= win->eventstate->y; - for(az= sa->actionzones.first; az; az= az->next) - if(BLI_in_rcti(&az->rect, x, y)) + for (az= sa->actionzones.first; az; az= az->next) + if (BLI_in_rcti(&az->rect, x, y)) return 1; } return 0; @@ -514,16 +514,16 @@ AZone *is_in_area_actionzone(ScrArea *sa, int x, int y) { AZone *az= NULL; - for(az= sa->actionzones.first; az; az= az->next) { - if(BLI_in_rcti(&az->rect, x, y)) { - if(az->type == AZONE_AREA) { + for (az= sa->actionzones.first; az; az= az->next) { + if (BLI_in_rcti(&az->rect, x, y)) { + if (az->type == AZONE_AREA) { /* no triangle intersect but a hotspot circle based on corner */ int radius= (x-az->x1)*(x-az->x1) + (y-az->y1)*(y-az->y1); - if(radius <= AZONESPOT*AZONESPOT) + if (radius <= AZONESPOT*AZONESPOT) break; } - else if(az->type == AZONE_REGION) { + else if (az->type == AZONE_REGION) { break; } } @@ -535,7 +535,7 @@ AZone *is_in_area_actionzone(ScrArea *sa, int x, int y) static void actionzone_exit(wmOperator *op) { - if(op->customdata) + if (op->customdata) MEM_freeN(op->customdata); op->customdata= NULL; } @@ -550,7 +550,7 @@ static void actionzone_apply(bContext *C, wmOperator *op, int type) sad->modifier= RNA_int_get(op->ptr, "modifier"); event= *(win->eventstate); /* XXX huh huh? make api call */ - if(type==AZONE_AREA) + if (type==AZONE_AREA) event.type= EVT_ACTIONZONE_AREA; else event.type= EVT_ACTIONZONE_REGION; @@ -567,7 +567,7 @@ static int actionzone_invoke(bContext *C, wmOperator *op, wmEvent *event) sActionzoneData *sad; /* quick escape */ - if(az==NULL) + if (az==NULL) return OPERATOR_PASS_THROUGH; /* ok we do the actionzone */ @@ -577,7 +577,7 @@ static int actionzone_invoke(bContext *C, wmOperator *op, wmEvent *event) sad->x= event->x; sad->y= event->y; /* region azone directly reacts on mouse clicks */ - if(sad->az->type==AZONE_REGION) { + if (sad->az->type==AZONE_REGION) { actionzone_apply(C, op, AZONE_REGION); actionzone_exit(op); return OPERATOR_FINISHED; @@ -603,17 +603,17 @@ static int actionzone_modal(bContext *C, wmOperator *op, wmEvent *event) deltax= (event->x - sad->x); deltay= (event->y - sad->y); - if(deltay > ABS(deltax)) + if (deltay > ABS(deltax)) sad->gesture_dir= 'n'; - else if(deltax > ABS(deltay)) + else if (deltax > ABS(deltay)) sad->gesture_dir= 'e'; - else if(deltay < -ABS(deltax)) + else if (deltay < -ABS(deltax)) sad->gesture_dir= 's'; else sad->gesture_dir= 'w'; /* gesture is large enough? */ - if(ABS(deltax) > mindelta || ABS(deltay) > mindelta) { + if (ABS(deltax) > mindelta || ABS(deltay) > mindelta) { /* second area, for join */ sad->sa2= screen_areahascursor(CTX_wm_screen(C), event->x, event->y); @@ -691,7 +691,7 @@ static int area_swap_init(wmOperator *op, wmEvent *event) sAreaSwapData *sd= NULL; sActionzoneData *sad= event->customdata; - if(sad==NULL || sad->sa1==NULL) + if (sad==NULL || sad->sa1==NULL) return 0; sd= MEM_callocN(sizeof(sAreaSwapData), "sAreaSwapData"); @@ -706,7 +706,7 @@ static int area_swap_init(wmOperator *op, wmEvent *event) static void area_swap_exit(bContext *C, wmOperator *op) { WM_cursor_restore(CTX_wm_window(C)); - if(op->customdata) + if (op->customdata) MEM_freeN(op->customdata); op->customdata= NULL; } @@ -720,7 +720,7 @@ static int area_swap_cancel(bContext *C, wmOperator *op) static int area_swap_invoke(bContext *C, wmOperator *op, wmEvent *event) { - if(!area_swap_init(op, event)) + if (!area_swap_init(op, event)) return OPERATOR_PASS_THROUGH; /* add modal handler */ @@ -741,8 +741,8 @@ static int area_swap_modal(bContext *C, wmOperator *op, wmEvent *event) sad->sa2= screen_areahascursor(CTX_wm_screen(C), event->x, event->y); break; case LEFTMOUSE: /* release LMB */ - if(event->val==KM_RELEASE) { - if(!sad->sa2 || sad->sa1 == sad->sa2) { + if (event->val==KM_RELEASE) { + if (!sad->sa2 || sad->sa1 == sad->sa2) { return area_swap_cancel(C, op); } @@ -795,18 +795,18 @@ static int area_dupli_invoke(bContext *C, wmOperator *op, wmEvent *event) sa= CTX_wm_area(C); /* XXX hrmf! */ - if(event->type==EVT_ACTIONZONE_AREA) { + if (event->type==EVT_ACTIONZONE_AREA) { sActionzoneData *sad= event->customdata; - if(sad==NULL) + if (sad==NULL) return OPERATOR_PASS_THROUGH; sa= sad->sa1; } /* poll() checks area context, but we don't accept full-area windows */ - if(sc->full != SCREENNORMAL) { - if(event->type==EVT_ACTIONZONE_AREA) + if (sc->full != SCREENNORMAL) { + if (event->type==EVT_ACTIONZONE_AREA) actionzone_exit(op); return OPERATOR_CANCELLED; } @@ -828,7 +828,7 @@ static int area_dupli_invoke(bContext *C, wmOperator *op, wmEvent *event) /* screen, areas init */ WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL); - if(event->type==EVT_ACTIONZONE_AREA) + if (event->type==EVT_ACTIONZONE_AREA) actionzone_exit(op); return OPERATOR_FINISHED; @@ -889,23 +889,23 @@ static void area_move_set_limits(bScreen *sc, int dir, int *bigger, int *smaller /* we check all areas and test for free space with MINSIZE */ *bigger= *smaller= 100000; - for(sa= sc->areabase.first; sa; sa= sa->next) { - if(dir=='h') { + for (sa= sc->areabase.first; sa; sa= sa->next) { + if (dir=='h') { int y1= sa->v2->vec.y - sa->v1->vec.y-areaminy; /* if top or down edge selected, test height */ - if(sa->v1->flag && sa->v4->flag) + if (sa->v1->flag && sa->v4->flag) *bigger= MIN2(*bigger, y1); - else if(sa->v2->flag && sa->v3->flag) + else if (sa->v2->flag && sa->v3->flag) *smaller= MIN2(*smaller, y1); } else { int x1= sa->v4->vec.x - sa->v1->vec.x-AREAMINX; /* if left or right edge selected, test width */ - if(sa->v1->flag && sa->v2->flag) + if (sa->v1->flag && sa->v2->flag) *bigger= MIN2(*bigger, x1); - else if(sa->v3->flag && sa->v4->flag) + else if (sa->v3->flag && sa->v4->flag) *smaller= MIN2(*smaller, x1); } } @@ -926,13 +926,13 @@ static int area_move_init (bContext *C, wmOperator *op) /* setup */ actedge= screen_find_active_scredge(sc, x, y); - if(actedge==NULL) return 0; + if (actedge==NULL) return 0; md= MEM_callocN(sizeof(sAreaMoveData), "sAreaMoveData"); op->customdata= md; md->dir= scredge_is_horizontal(actedge)?'h':'v'; - if(md->dir=='h') md->origval= actedge->v1->vec.y; + if (md->dir=='h') md->origval= actedge->v1->vec.y; else md->origval= actedge->v1->vec.x; select_connected_scredge(sc, actedge); @@ -957,25 +957,25 @@ static void area_move_apply_do(bContext *C, int origval, int delta, int dir, int for (v1= sc->vertbase.first; v1; v1= v1->next) { if (v1->flag) { /* that way a nice AREAGRID */ - if((dir=='v') && v1->vec.x>0 && v1->vec.x<win->sizex-1) { + if ((dir=='v') && v1->vec.x>0 && v1->vec.x<win->sizex-1) { v1->vec.x= origval + delta; - if(delta != bigger && delta != -smaller) v1->vec.x-= (v1->vec.x % AREAGRID); + if (delta != bigger && delta != -smaller) v1->vec.x-= (v1->vec.x % AREAGRID); } - if((dir=='h') && v1->vec.y>0 && v1->vec.y<win->sizey-1) { + if ((dir=='h') && v1->vec.y>0 && v1->vec.y<win->sizey-1) { v1->vec.y= origval + delta; v1->vec.y+= AREAGRID-1; v1->vec.y-= (v1->vec.y % AREAGRID); /* prevent too small top header */ - if(v1->vec.y > win->sizey-areaminy) + if (v1->vec.y > win->sizey-areaminy) v1->vec.y= win->sizey-areaminy; } } } - for(sa= sc->areabase.first; sa; sa= sa->next) { - if(sa->v1->flag || sa->v2->flag || sa->v3->flag || sa->v4->flag) + for (sa= sc->areabase.first; sa; sa= sa->next) { + if (sa->v1->flag || sa->v2->flag || sa->v3->flag || sa->v4->flag) ED_area_tag_redraw(sa); } @@ -993,7 +993,7 @@ static void area_move_apply(bContext *C, wmOperator *op) static void area_move_exit(bContext *C, wmOperator *op) { - if(op->customdata) + if (op->customdata) MEM_freeN(op->customdata); op->customdata= NULL; @@ -1004,7 +1004,7 @@ static void area_move_exit(bContext *C, wmOperator *op) static int area_move_exec(bContext *C, wmOperator *op) { - if(!area_move_init(C, op)) + if (!area_move_init(C, op)) return OPERATOR_CANCELLED; area_move_apply(C, op); @@ -1019,7 +1019,7 @@ static int area_move_invoke(bContext *C, wmOperator *op, wmEvent *event) RNA_int_set(op->ptr, "x", event->x); RNA_int_set(op->ptr, "y", event->y); - if(!area_move_init(C, op)) + if (!area_move_init(C, op)) return OPERATOR_PASS_THROUGH; /* add temp handler */ @@ -1052,7 +1052,7 @@ static int area_move_modal(bContext *C, wmOperator *op, wmEvent *event) y= RNA_int_get(op->ptr, "y"); delta= (md->dir == 'v')? event->x - x: event->y - y; - if(md->step) delta= delta - (delta % md->step); + if (md->step) delta= delta - (delta % md->step); RNA_int_set(op->ptr, "delta", delta); area_move_apply(C, op); @@ -1166,10 +1166,10 @@ static int area_split_menu_init(bContext *C, wmOperator *op) sd->sarea= CTX_wm_area(C); - if(sd->sarea) { + if (sd->sarea) { int dir= RNA_enum_get(op->ptr, "direction"); - if(dir=='h') + if (dir=='h') sd->sarea->flag |= AREA_FLAG_DRAWSPLIT_H; else sd->sarea->flag |= AREA_FLAG_DRAWSPLIT_V; @@ -1186,14 +1186,14 @@ static int area_split_init(bContext *C, wmOperator *op) int dir; /* required context */ - if(sa==NULL) return 0; + if (sa==NULL) return 0; /* required properties */ dir= RNA_enum_get(op->ptr, "direction"); /* minimal size */ - if(dir=='v' && sa->winx < 2*AREAMINX) return 0; - if(dir=='h' && sa->winy < 2*areaminy) return 0; + if (dir=='v' && sa->winx < 2*AREAMINX) return 0; + if (dir=='h' && sa->winy < 2*areaminy) return 0; /* custom data */ sd= (sAreaSplitData*)MEM_callocN(sizeof (sAreaSplitData), "op_area_split"); @@ -1219,16 +1219,16 @@ static ScrEdge *area_findsharededge(bScreen *screen, ScrArea *sa, ScrArea *sb) ScrVert *sbv3= sb->v3; ScrVert *sbv4= sb->v4; - if(sav1==sbv4 && sav2==sbv3) { /* sa to right of sb = W */ + if (sav1==sbv4 && sav2==sbv3) { /* sa to right of sb = W */ return screen_findedge(screen, sav1, sav2); } - else if(sav2==sbv1 && sav3==sbv4) { /* sa to bottom of sb = N */ + else if (sav2==sbv1 && sav3==sbv4) { /* sa to bottom of sb = N */ return screen_findedge(screen, sav2, sav3); } - else if(sav3==sbv2 && sav4==sbv1) { /* sa to left of sb = E */ + else if (sav3==sbv2 && sav4==sbv1) { /* sa to left of sb = E */ return screen_findedge(screen, sav3, sav4); } - else if(sav1==sbv2 && sav4==sbv3) { /* sa on top of sb = S*/ + else if (sav1==sbv2 && sav4==sbv3) { /* sa on top of sb = S*/ return screen_findedge(screen, sav1, sav4); } @@ -1249,19 +1249,19 @@ static int area_split_apply(bContext *C, wmOperator *op) sd->narea= area_split(sc, sd->sarea, dir, fac, 0); /* 0 = no merge */ - if(sd->narea) { + if (sd->narea) { ScrVert *sv; sd->nedge= area_findsharededge(sc, sd->sarea, sd->narea); /* select newly created edge, prepare for moving edge */ - for(sv= sc->vertbase.first; sv; sv= sv->next) + for (sv= sc->vertbase.first; sv; sv= sv->next) sv->flag = 0; sd->nedge->v1->flag= 1; sd->nedge->v2->flag= 1; - if(dir=='h') sd->origval= sd->nedge->v1->vec.y; + if (dir=='h') sd->origval= sd->nedge->v1->vec.y; else sd->origval= sd->nedge->v1->vec.x; ED_area_tag_redraw(sd->sarea); @@ -1279,10 +1279,10 @@ static void area_split_exit(bContext *C, wmOperator *op) { if (op->customdata) { sAreaSplitData *sd= (sAreaSplitData *)op->customdata; - if(sd->sarea) ED_area_tag_redraw(sd->sarea); - if(sd->narea) ED_area_tag_redraw(sd->narea); + if (sd->sarea) ED_area_tag_redraw(sd->sarea); + if (sd->narea) ED_area_tag_redraw(sd->narea); - if(sd->sarea) + if (sd->sarea) sd->sarea->flag &= ~(AREA_FLAG_DRAWSPLIT_H|AREA_FLAG_DRAWSPLIT_V); MEM_freeN(op->customdata); @@ -1305,26 +1305,26 @@ static int area_split_invoke(bContext *C, wmOperator *op, wmEvent *event) int dir; /* no full window splitting allowed */ - if(CTX_wm_screen(C)->full != SCREENNORMAL) + if (CTX_wm_screen(C)->full != SCREENNORMAL) return OPERATOR_CANCELLED; - if(event->type==EVT_ACTIONZONE_AREA) { + if (event->type==EVT_ACTIONZONE_AREA) { sActionzoneData *sad= event->customdata; - if(sad->modifier>0) { + if (sad->modifier>0) { return OPERATOR_PASS_THROUGH; } /* verify *sad itself */ - if(sad==NULL || sad->sa1==NULL || sad->az==NULL) + if (sad==NULL || sad->sa1==NULL || sad->az==NULL) return OPERATOR_PASS_THROUGH; /* is this our *sad? if areas not equal it should be passed on */ - if(CTX_wm_area(C)!=sad->sa1 || sad->sa1!=sad->sa2) + if (CTX_wm_area(C)!=sad->sa1 || sad->sa1!=sad->sa2) return OPERATOR_PASS_THROUGH; /* prepare operator state vars */ - if(sad->gesture_dir=='n' || sad->gesture_dir=='s') { + if (sad->gesture_dir=='n' || sad->gesture_dir=='s') { dir= 'h'; RNA_float_set(op->ptr, "factor", ((float)(event->x - sad->sa1->v1->vec.x)) / (float)sad->sa1->winx); } @@ -1335,7 +1335,7 @@ static int area_split_invoke(bContext *C, wmOperator *op, wmEvent *event) RNA_enum_set(op->ptr, "direction", dir); /* general init, also non-UI case, adds customdata, sets area and defaults */ - if(!area_split_init(C, op)) + if (!area_split_init(C, op)) return OPERATOR_PASS_THROUGH; } @@ -1344,18 +1344,18 @@ static int area_split_invoke(bContext *C, wmOperator *op, wmEvent *event) int x, y; /* retrieve initial mouse coord, so we can find the active edge */ - if(RNA_struct_property_is_set(op->ptr, "mouse_x")) + if (RNA_struct_property_is_set(op->ptr, "mouse_x")) x= RNA_int_get(op->ptr, "mouse_x"); else x= event->x; - if(RNA_struct_property_is_set(op->ptr, "mouse_y")) + if (RNA_struct_property_is_set(op->ptr, "mouse_y")) y= RNA_int_get(op->ptr, "mouse_y"); else y= event->x; actedge= screen_find_active_scredge(CTX_wm_screen(C), x, y); - if(actedge==NULL) + if (actedge==NULL) return OPERATOR_CANCELLED; dir= scredge_is_horizontal(actedge)?'v':'h'; @@ -1363,7 +1363,7 @@ static int area_split_invoke(bContext *C, wmOperator *op, wmEvent *event) RNA_enum_set(op->ptr, "direction", dir); /* special case, adds customdata, sets defaults */ - if(!area_split_menu_init(C, op)) + if (!area_split_menu_init(C, op)) return OPERATOR_CANCELLED; } @@ -1373,10 +1373,10 @@ static int area_split_invoke(bContext *C, wmOperator *op, wmEvent *event) sd->x= event->x; sd->y= event->y; - if(event->type==EVT_ACTIONZONE_AREA) { + if (event->type==EVT_ACTIONZONE_AREA) { /* do the split */ - if(area_split_apply(C, op)) { + if (area_split_apply(C, op)) { area_move_set_limits(CTX_wm_screen(C), dir, &sd->bigger, &sd->smaller); /* add temp handler for edge move or cancel */ @@ -1401,7 +1401,7 @@ static int area_split_invoke(bContext *C, wmOperator *op, wmEvent *event) static int area_split_exec(bContext *C, wmOperator *op) { - if(!area_split_init(C, op)) + if (!area_split_init(C, op)) return OPERATOR_CANCELLED; area_split_apply(C, op); @@ -1415,7 +1415,7 @@ static int area_split_cancel(bContext *C, wmOperator *op) { sAreaSplitData *sd= (sAreaSplitData *)op->customdata; - if(sd->previewmode) { + if (sd->previewmode) { } else { if (screen_area_join(C, CTX_wm_screen(C), sd->sarea, sd->narea)) { @@ -1443,16 +1443,16 @@ static int area_split_modal(bContext *C, wmOperator *op, wmEvent *event) dir= RNA_enum_get(op->ptr, "direction"); sd->delta= (dir == 'v')? event->x - sd->origval: event->y - sd->origval; - if(sd->previewmode==0) + if (sd->previewmode==0) area_move_apply_do(C, sd->origval, sd->delta, dir, sd->bigger, sd->smaller); else { - if(sd->sarea) { + if (sd->sarea) { sd->sarea->flag &= ~(AREA_FLAG_DRAWSPLIT_H|AREA_FLAG_DRAWSPLIT_V); ED_area_tag_redraw(sd->sarea); } sd->sarea= screen_areahascursor(CTX_wm_screen(C), event->x, event->y); /* area context not set */ - if(sd->sarea) { + if (sd->sarea) { ED_area_tag_redraw(sd->sarea); if (dir=='v') { sd->origsize= sd->sarea->winx; @@ -1476,13 +1476,13 @@ static int area_split_modal(bContext *C, wmOperator *op, wmEvent *event) break; case LEFTMOUSE: - if(sd->previewmode) { + if (sd->previewmode) { area_split_apply(C, op); area_split_exit(C, op); return OPERATOR_FINISHED; } else { - if(event->val==KM_RELEASE) { /* mouse up */ + if (event->val==KM_RELEASE) { /* mouse up */ area_split_exit(C, op); return OPERATOR_FINISHED; } @@ -1491,23 +1491,23 @@ static int area_split_modal(bContext *C, wmOperator *op, wmEvent *event) case MIDDLEMOUSE: case TABKEY: - if (sd->previewmode==0){ + if (sd->previewmode==0) { } - else{ + else { dir = RNA_enum_get(op->ptr, "direction"); - if(event->val==KM_PRESS){ - if (sd->sarea){ + if (event->val==KM_PRESS) { + if (sd->sarea) { sd->sarea->flag &= ~(AREA_FLAG_DRAWSPLIT_H|AREA_FLAG_DRAWSPLIT_V); ED_area_tag_redraw(sd->sarea); - if (dir=='v'){ + if (dir=='v') { RNA_enum_set(op->ptr, "direction", 'h'); sd->sarea->flag |= AREA_FLAG_DRAWSPLIT_H; WM_cursor_set(CTX_wm_window(C),CURSOR_X_MOVE); } - else{ + else { RNA_enum_set(op->ptr, "direction", 'v'); sd->sarea->flag |= AREA_FLAG_DRAWSPLIT_V; @@ -1574,9 +1574,10 @@ static int area_max_regionsize(ScrArea *sa, ARegion *scalear, AZEdge edge) ARegion *ar; int dist; - if(edge==AE_RIGHT_TO_TOPLEFT || edge==AE_LEFT_TO_TOPRIGHT) { + if (edge==AE_RIGHT_TO_TOPLEFT || edge==AE_LEFT_TO_TOPRIGHT) { dist = sa->totrct.xmax - sa->totrct.xmin; - } else { /* AE_BOTTOM_TO_TOPLEFT, AE_TOP_TO_BOTTOMRIGHT */ + } + else { /* AE_BOTTOM_TO_TOPLEFT, AE_TOP_TO_BOTTOMRIGHT */ dist = sa->totrct.ymax - sa->totrct.ymin; } @@ -1611,14 +1612,14 @@ static int region_scale_invoke(bContext *C, wmOperator *op, wmEvent *event) sActionzoneData *sad= event->customdata; AZone *az; - if(event->type!=EVT_ACTIONZONE_REGION) { + if (event->type!=EVT_ACTIONZONE_REGION) { BKE_report(op->reports, RPT_ERROR, "Can only scale region size from an action zone"); return OPERATOR_CANCELLED; } az = sad->az; - if(az->ar) { + if (az->ar) { RegionMoveData *rmd= MEM_callocN(sizeof(RegionMoveData), "RegionMoveData"); int maxsize; @@ -1633,15 +1634,16 @@ static int region_scale_invoke(bContext *C, wmOperator *op, wmEvent *event) rmd->maxsize = area_max_regionsize(rmd->sa, rmd->ar, rmd->edge); /* if not set we do now, otherwise it uses type */ - if(rmd->ar->sizex==0) + if (rmd->ar->sizex==0) rmd->ar->sizex= rmd->ar->type->prefsizex; - if(rmd->ar->sizey==0) + if (rmd->ar->sizey==0) rmd->ar->sizey= rmd->ar->type->prefsizey; /* now copy to regionmovedata */ - if(rmd->edge==AE_LEFT_TO_TOPRIGHT || rmd->edge==AE_RIGHT_TO_TOPLEFT) { + if (rmd->edge==AE_LEFT_TO_TOPRIGHT || rmd->edge==AE_RIGHT_TO_TOPLEFT) { rmd->origval= rmd->ar->sizex; - } else { + } + else { rmd->origval= rmd->ar->sizey; } @@ -1666,11 +1668,11 @@ static int region_scale_get_maxsize(RegionMoveData *rmd) { int maxsize= 0; - if(rmd->edge==AE_LEFT_TO_TOPRIGHT || rmd->edge==AE_RIGHT_TO_TOPLEFT) { + if (rmd->edge==AE_LEFT_TO_TOPRIGHT || rmd->edge==AE_RIGHT_TO_TOPLEFT) { return rmd->sa->winx - UI_UNIT_X; } - if(rmd->ar->regiontype == RGN_TYPE_TOOL_PROPS) { + if (rmd->ar->regiontype == RGN_TYPE_TOOL_PROPS) { /* this calculation seems overly verbose * can someone explain why this method is necessary? - campbell */ maxsize = rmd->maxsize - ((rmd->sa->headertype==HEADERTOP)?UI_UNIT_Y*2:UI_UNIT_Y) - (UI_UNIT_Y/4); @@ -1681,18 +1683,18 @@ static int region_scale_get_maxsize(RegionMoveData *rmd) static void region_scale_validate_size(RegionMoveData *rmd) { - if((rmd->ar->flag & RGN_FLAG_HIDDEN)==0) { + if ((rmd->ar->flag & RGN_FLAG_HIDDEN)==0) { short *size, maxsize= -1; - if(rmd->edge==AE_LEFT_TO_TOPRIGHT || rmd->edge==AE_RIGHT_TO_TOPLEFT) + if (rmd->edge==AE_LEFT_TO_TOPRIGHT || rmd->edge==AE_RIGHT_TO_TOPLEFT) size= &rmd->ar->sizex; else size= &rmd->ar->sizey; maxsize= region_scale_get_maxsize(rmd); - if(*size > maxsize && maxsize > 0) + if (*size > maxsize && maxsize > 0) *size= maxsize; } } @@ -1712,25 +1714,25 @@ static int region_scale_modal(bContext *C, wmOperator *op, wmEvent *event) switch(event->type) { case MOUSEMOVE: - if(rmd->edge==AE_LEFT_TO_TOPRIGHT || rmd->edge==AE_RIGHT_TO_TOPLEFT) { + if (rmd->edge==AE_LEFT_TO_TOPRIGHT || rmd->edge==AE_RIGHT_TO_TOPLEFT) { delta= event->x - rmd->origx; - if(rmd->edge==AE_LEFT_TO_TOPRIGHT) delta= -delta; + if (rmd->edge==AE_LEFT_TO_TOPRIGHT) delta= -delta; rmd->ar->sizex= rmd->origval + delta; CLAMP(rmd->ar->sizex, 0, rmd->maxsize); - if(rmd->ar->sizex < UI_UNIT_X) { + if (rmd->ar->sizex < UI_UNIT_X) { rmd->ar->sizex= rmd->origval; - if(!(rmd->ar->flag & RGN_FLAG_HIDDEN)) + if (!(rmd->ar->flag & RGN_FLAG_HIDDEN)) region_scale_toggle_hidden(C, rmd); } - else if(rmd->ar->flag & RGN_FLAG_HIDDEN) + else if (rmd->ar->flag & RGN_FLAG_HIDDEN) region_scale_toggle_hidden(C, rmd); } else { int maxsize= region_scale_get_maxsize(rmd); delta= event->y - rmd->origy; - if(rmd->edge==AE_BOTTOM_TO_TOPLEFT) delta= -delta; + if (rmd->edge==AE_BOTTOM_TO_TOPLEFT) delta= -delta; rmd->ar->sizey= rmd->origval + delta; CLAMP(rmd->ar->sizey, 0, rmd->maxsize); @@ -1738,14 +1740,14 @@ static int region_scale_modal(bContext *C, wmOperator *op, wmEvent *event) /* note, 'UI_UNIT_Y/4' means you need to drag the header almost * all the way down for it to become hidden, this is done * otherwise its too easy to do this by accident */ - if(rmd->ar->sizey < UI_UNIT_Y/4) { + if (rmd->ar->sizey < UI_UNIT_Y/4) { rmd->ar->sizey= rmd->origval; - if(!(rmd->ar->flag & RGN_FLAG_HIDDEN)) + if (!(rmd->ar->flag & RGN_FLAG_HIDDEN)) region_scale_toggle_hidden(C, rmd); } - else if(maxsize > 0 && (rmd->ar->sizey > maxsize)) + else if (maxsize > 0 && (rmd->ar->sizey > maxsize)) rmd->ar->sizey= maxsize; - else if(rmd->ar->flag & RGN_FLAG_HIDDEN) + else if (rmd->ar->flag & RGN_FLAG_HIDDEN) region_scale_toggle_hidden(C, rmd); } ED_area_tag_redraw(rmd->sa); @@ -1754,13 +1756,13 @@ static int region_scale_modal(bContext *C, wmOperator *op, wmEvent *event) break; case LEFTMOUSE: - if(event->val==KM_RELEASE) { + if (event->val==KM_RELEASE) { - if(ABS(event->x - rmd->origx) < 2 && ABS(event->y - rmd->origy) < 2) { - if(rmd->ar->flag & RGN_FLAG_HIDDEN) { + if (ABS(event->x - rmd->origx) < 2 && ABS(event->y - rmd->origy) < 2) { + if (rmd->ar->flag & RGN_FLAG_HIDDEN) { region_scale_toggle_hidden(C, rmd); } - else if(rmd->ar->flag & RGN_FLAG_TOO_SMALL) { + else if (rmd->ar->flag & RGN_FLAG_TOO_SMALL) { region_scale_validate_size(rmd); } @@ -1854,7 +1856,7 @@ static int frame_jump_exec(bContext *C, wmOperator *op) * first/last frame not to be actually shown (bad since for example physics * simulations aren't reset properly). */ - if(animtimer) { + if (animtimer) { ScreenAnimData *sad = animtimer->customdata; sad->flag |= ANIMPLAY_FLAG_USE_NEXT_FRAME; @@ -1990,22 +1992,22 @@ static int screen_set_exec(bContext *C, wmOperator *op) int delta= RNA_int_get(op->ptr, "delta"); /* temp screens are for userpref or render display */ - if(screen->temp) + if (screen->temp) return OPERATOR_CANCELLED; - if(delta==1) { - while(tot--) { + if (delta==1) { + while (tot--) { screen= screen->id.next; - if(screen==NULL) screen= CTX_data_main(C)->screen.first; - if(screen->winid==0 && screen->full==0 && screen != screen_prev) + if (screen==NULL) screen= CTX_data_main(C)->screen.first; + if (screen->winid==0 && screen->full==0 && screen != screen_prev) break; } } - else if(delta== -1) { - while(tot--) { + else if (delta== -1) { + while (tot--) { screen= screen->id.prev; - if(screen==NULL) screen= CTX_data_main(C)->screen.last; - if(screen->winid==0 && screen->full==0 && screen != screen_prev) + if (screen==NULL) screen= CTX_data_main(C)->screen.last; + if (screen->winid==0 && screen->full==0 && screen != screen_prev) break; } } @@ -2013,9 +2015,9 @@ static int screen_set_exec(bContext *C, wmOperator *op) screen= NULL; } - if(screen && screen_prev != screen) { + if (screen && screen_prev != screen) { /* return to previous state before switching screens */ - if(sa && sa->full) { + if (sa && sa->full) { ED_screen_full_restore(C, sa); /* may free 'screen_prev' */ } @@ -2053,7 +2055,7 @@ static int screen_full_area_exec(bContext *C, wmOperator *UNUSED(op)) if (sa->full) break; } - if(sa==NULL) sa= CTX_wm_area(C); + if (sa==NULL) sa= CTX_wm_area(C); ED_screen_full_toggle(C, CTX_wm_window(C), sa); return OPERATOR_FINISHED; @@ -2130,15 +2132,15 @@ static int area_join_init(bContext *C, wmOperator *op) sa1 = screen_areahascursor(CTX_wm_screen(C), x1, y1); sa2 = screen_areahascursor(CTX_wm_screen(C), x2, y2); - if(sa1==NULL || sa2==NULL || sa1==sa2) + if (sa1==NULL || sa2==NULL || sa1==sa2) return 0; /* do areas share an edge? */ - if(sa1->v1==sa2->v1 || sa1->v1==sa2->v2 || sa1->v1==sa2->v3 || sa1->v1==sa2->v4) shared++; - if(sa1->v2==sa2->v1 || sa1->v2==sa2->v2 || sa1->v2==sa2->v3 || sa1->v2==sa2->v4) shared++; - if(sa1->v3==sa2->v1 || sa1->v3==sa2->v2 || sa1->v3==sa2->v3 || sa1->v3==sa2->v4) shared++; - if(sa1->v4==sa2->v1 || sa1->v4==sa2->v2 || sa1->v4==sa2->v3 || sa1->v4==sa2->v4) shared++; - if(shared!=2) { + if (sa1->v1==sa2->v1 || sa1->v1==sa2->v2 || sa1->v1==sa2->v3 || sa1->v1==sa2->v4) shared++; + if (sa1->v2==sa2->v1 || sa1->v2==sa2->v2 || sa1->v2==sa2->v3 || sa1->v2==sa2->v4) shared++; + if (sa1->v3==sa2->v1 || sa1->v3==sa2->v2 || sa1->v3==sa2->v3 || sa1->v3==sa2->v4) shared++; + if (sa1->v4==sa2->v1 || sa1->v4==sa2->v2 || sa1->v4==sa2->v3 || sa1->v4==sa2->v4) shared++; + if (shared!=2) { printf("areas don't share edge\n"); return 0; } @@ -2161,7 +2163,7 @@ static int area_join_apply(bContext *C, wmOperator *op) sAreaJoinData *jd = (sAreaJoinData *)op->customdata; if (!jd) return 0; - if(!screen_area_join(C, CTX_wm_screen(C), jd->sa1, jd->sa2)){ + if (!screen_area_join(C, CTX_wm_screen(C), jd->sa1, jd->sa2)) { return 0; } if (CTX_wm_area(C) == jd->sa2) { @@ -2188,7 +2190,7 @@ static void area_join_exit(bContext *C, wmOperator *op) static int area_join_exec(bContext *C, wmOperator *op) { - if(!area_join_init(C, op)) + if (!area_join_init(C, op)) return OPERATOR_CANCELLED; area_join_apply(C, op); @@ -2201,19 +2203,19 @@ static int area_join_exec(bContext *C, wmOperator *op) static int area_join_invoke(bContext *C, wmOperator *op, wmEvent *event) { - if(event->type==EVT_ACTIONZONE_AREA) { + if (event->type==EVT_ACTIONZONE_AREA) { sActionzoneData *sad= event->customdata; - if(sad->modifier>0) { + if (sad->modifier>0) { return OPERATOR_PASS_THROUGH; } /* verify *sad itself */ - if(sad==NULL || sad->sa1==NULL || sad->sa2==NULL) + if (sad==NULL || sad->sa1==NULL || sad->sa2==NULL) return OPERATOR_PASS_THROUGH; /* is this our *sad? if areas equal it should be passed on */ - if(sad->sa1==sad->sa2) + if (sad->sa1==sad->sa2) return OPERATOR_PASS_THROUGH; /* prepare operator state vars */ @@ -2224,7 +2226,7 @@ static int area_join_invoke(bContext *C, wmOperator *op, wmEvent *event) } - if(!area_join_init(C, op)) + if (!area_join_init(C, op)) return OPERATOR_PASS_THROUGH; /* add temp handler */ @@ -2325,7 +2327,7 @@ static int area_join_modal(bContext *C, wmOperator *op, wmEvent *event) } break; case LEFTMOUSE: - if(event->val==KM_RELEASE) { + if (event->val==KM_RELEASE) { ED_area_tag_redraw(jd->sa1); ED_area_tag_redraw(jd->sa2); @@ -2377,7 +2379,7 @@ static int screen_area_options_invoke(bContext *C, wmOperator *op, wmEvent *even PointerRNA ptr1, ptr2; ScrEdge *actedge= screen_find_active_scredge(CTX_wm_screen(C), event->x, event->y); - if(actedge==NULL) return OPERATOR_CANCELLED; + if (actedge==NULL) return OPERATOR_CANCELLED; pup= uiPupMenuBegin(C, op->type->name, ICON_NONE); layout= uiPupMenuLayout(pup); @@ -2428,9 +2430,9 @@ static int spacedata_cleanup(bContext *C, wmOperator *op) ScrArea *sa; int tot= 0; - for(screen= bmain->screen.first; screen; screen= screen->id.next) { - for(sa= screen->areabase.first; sa; sa= sa->next) { - if(sa->spacedata.first != sa->spacedata.last) { + for (screen= bmain->screen.first; screen; screen= screen->id.next) { + for (sa= screen->areabase.first; sa; sa= sa->next) { + if (sa->spacedata.first != sa->spacedata.last) { SpaceLink *sl= sa->spacedata.first; BLI_remlink(&sa->spacedata, sl); @@ -2464,7 +2466,7 @@ static int repeat_last_exec(bContext *C, wmOperator *UNUSED(op)) { wmOperator *lastop= CTX_wm_manager(C)->operators.last; - if(lastop) + if (lastop) WM_operator_repeat(C, lastop); return OPERATOR_CANCELLED; @@ -2493,7 +2495,7 @@ static int repeat_history_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(ev int items, i; items= BLI_countlist(&wm->operators); - if(items==0) + if (items==0) return OPERATOR_CANCELLED; pup= uiPupMenuBegin(C, op->type->name, ICON_NONE); @@ -2512,7 +2514,7 @@ static int repeat_history_exec(bContext *C, wmOperator *op) wmWindowManager *wm= CTX_wm_manager(C); op= BLI_findlink(&wm->operators, RNA_int_get(op->ptr, "index")); - if(op) { + if (op) { /* let's put it as last operator in list */ BLI_remlink(&wm->operators, op); BLI_addtail(&wm->operators, op); @@ -2545,7 +2547,7 @@ static int redo_last_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED { wmOperator *lastop= WM_operator_last_redo(C); - if(lastop) + if (lastop) WM_operator_redo_popup(C, lastop); return OPERATOR_CANCELLED; @@ -2572,24 +2574,24 @@ static int region_quadview_exec(bContext *C, wmOperator *op) ARegion *ar= CTX_wm_region(C); /* some rules... */ - if(ar->regiontype!=RGN_TYPE_WINDOW) + if (ar->regiontype!=RGN_TYPE_WINDOW) BKE_report(op->reports, RPT_ERROR, "Only window region can be 4-splitted"); - else if(ar->alignment==RGN_ALIGN_QSPLIT) { + else if (ar->alignment==RGN_ALIGN_QSPLIT) { ScrArea *sa= CTX_wm_area(C); ARegion *arn; /* keep current region */ ar->alignment= 0; - if(sa->spacetype==SPACE_VIEW3D) { + if (sa->spacetype==SPACE_VIEW3D) { RegionView3D *rv3d= ar->regiondata; rv3d->viewlock= 0; rv3d->rflag &= ~RV3D_CLIPPING; } - for(ar= sa->regionbase.first; ar; ar= arn) { + for (ar= sa->regionbase.first; ar; ar= arn) { arn= ar->next; - if(ar->alignment==RGN_ALIGN_QSPLIT) { + if (ar->alignment==RGN_ALIGN_QSPLIT) { ED_region_exit(C, ar); BKE_area_region_free(sa->type, ar); BLI_remlink(&sa->regionbase, ar); @@ -2599,7 +2601,7 @@ static int region_quadview_exec(bContext *C, wmOperator *op) ED_area_tag_redraw(sa); WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL); } - else if(ar->next) + else if (ar->next) BKE_report(op->reports, RPT_ERROR, "Only last region can be 4-splitted"); else { ScrArea *sa= CTX_wm_area(C); @@ -2608,13 +2610,13 @@ static int region_quadview_exec(bContext *C, wmOperator *op) ar->alignment= RGN_ALIGN_QSPLIT; - for(count=0; count<3; count++) { + for (count=0; count<3; count++) { newar= BKE_area_region_copy(sa->type, ar); BLI_addtail(&sa->regionbase, newar); } /* lock views and set them */ - if(sa->spacetype==SPACE_VIEW3D) { + if (sa->spacetype==SPACE_VIEW3D) { /* run ED_view3d_lock() so the correct 'rv3d->viewquat' is set, * otherwise when restoring rv3d->localvd the 'viewquat' won't * match the 'view', set on entering localview See: [#26315], @@ -2680,13 +2682,13 @@ static int region_flip_exec(bContext *C, wmOperator *UNUSED(op)) if (!ar) return OPERATOR_CANCELLED; - if(ar->alignment==RGN_ALIGN_TOP) + if (ar->alignment==RGN_ALIGN_TOP) ar->alignment= RGN_ALIGN_BOTTOM; - else if(ar->alignment==RGN_ALIGN_BOTTOM) + else if (ar->alignment==RGN_ALIGN_BOTTOM) ar->alignment= RGN_ALIGN_TOP; - else if(ar->alignment==RGN_ALIGN_LEFT) + else if (ar->alignment==RGN_ALIGN_LEFT) ar->alignment= RGN_ALIGN_RIGHT; - else if(ar->alignment==RGN_ALIGN_RIGHT) + else if (ar->alignment==RGN_ALIGN_RIGHT) ar->alignment= RGN_ALIGN_LEFT; ED_area_tag_redraw(CTX_wm_area(C)); @@ -2718,23 +2720,23 @@ static int header_flip_exec(bContext *C, wmOperator *UNUSED(op)) /* find the header region * - try context first, but upon failing, search all regions in area... */ - if((ar == NULL) || (ar->regiontype != RGN_TYPE_HEADER)) { + if ((ar == NULL) || (ar->regiontype != RGN_TYPE_HEADER)) { ScrArea *sa= CTX_wm_area(C); ar= BKE_area_find_region_type(sa, RGN_TYPE_HEADER); /* don't do anything if no region */ - if(ar == NULL) + if (ar == NULL) return OPERATOR_CANCELLED; } /* copied from SCREEN_OT_region_flip */ - if(ar->alignment==RGN_ALIGN_TOP) + if (ar->alignment==RGN_ALIGN_TOP) ar->alignment= RGN_ALIGN_BOTTOM; - else if(ar->alignment==RGN_ALIGN_BOTTOM) + else if (ar->alignment==RGN_ALIGN_BOTTOM) ar->alignment= RGN_ALIGN_TOP; - else if(ar->alignment==RGN_ALIGN_LEFT) + else if (ar->alignment==RGN_ALIGN_LEFT) ar->alignment= RGN_ALIGN_RIGHT; - else if(ar->alignment==RGN_ALIGN_RIGHT) + else if (ar->alignment==RGN_ALIGN_RIGHT) ar->alignment= RGN_ALIGN_LEFT; ED_area_tag_redraw(CTX_wm_area(C)); @@ -2818,49 +2820,49 @@ static int match_area_with_refresh(int spacetype, int refresh) static int match_region_with_redraws(int spacetype, int regiontype, int redraws) { - if(regiontype==RGN_TYPE_WINDOW) { + if (regiontype==RGN_TYPE_WINDOW) { switch (spacetype) { case SPACE_VIEW3D: - if(redraws & TIME_ALL_3D_WIN) + if (redraws & TIME_ALL_3D_WIN) return 1; break; case SPACE_IPO: case SPACE_ACTION: case SPACE_NLA: - if(redraws & TIME_ALL_ANIM_WIN) + if (redraws & TIME_ALL_ANIM_WIN) return 1; break; case SPACE_TIME: /* if only 1 window or 3d windows, we do timeline too */ - if(redraws & (TIME_ALL_ANIM_WIN|TIME_REGION|TIME_ALL_3D_WIN)) + if (redraws & (TIME_ALL_ANIM_WIN|TIME_REGION|TIME_ALL_3D_WIN)) return 1; break; case SPACE_BUTS: - if(redraws & TIME_ALL_BUTS_WIN) + if (redraws & TIME_ALL_BUTS_WIN) return 1; break; case SPACE_SEQ: - if(redraws & (TIME_SEQ|TIME_ALL_ANIM_WIN)) + if (redraws & (TIME_SEQ|TIME_ALL_ANIM_WIN)) return 1; break; case SPACE_NODE: - if(redraws & (TIME_NODES)) + if (redraws & (TIME_NODES)) return 1; break; case SPACE_IMAGE: - if(redraws & TIME_ALL_IMAGE_WIN) + if (redraws & TIME_ALL_IMAGE_WIN) return 1; break; case SPACE_CLIP: - if(redraws & TIME_CLIPS) + if (redraws & TIME_CLIPS) return 1; break; } } - else if(regiontype==RGN_TYPE_UI) { - if(spacetype==SPACE_CLIP) { + else if (regiontype==RGN_TYPE_UI) { + if (spacetype==SPACE_CLIP) { /* Track Preview button is on Properties Editor in SpaceClip, * and it's very common case when users want it be refreshing * during playback, so asking people to enable special option @@ -2869,17 +2871,17 @@ static int match_region_with_redraws(int spacetype, int regiontype, int redraws) return 1; } - if(redraws & TIME_ALL_BUTS_WIN) + if (redraws & TIME_ALL_BUTS_WIN) return 1; } - else if(regiontype==RGN_TYPE_HEADER) { - if(spacetype==SPACE_TIME) + else if (regiontype==RGN_TYPE_HEADER) { + if (spacetype==SPACE_TIME) return 1; } else if (regiontype==RGN_TYPE_PREVIEW) { switch (spacetype) { case SPACE_SEQ: - if(redraws & (TIME_SEQ|TIME_ALL_ANIM_WIN)) + if (redraws & (TIME_SEQ|TIME_ALL_ANIM_WIN)) return 1; break; case SPACE_CLIP: @@ -2893,7 +2895,7 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), wmEvent *e { bScreen *screen= CTX_wm_screen(C); - if(screen->animtimer && screen->animtimer==event->customdata) { + if (screen->animtimer && screen->animtimer==event->customdata) { Main *bmain= CTX_data_main(C); Scene *scene= CTX_data_scene(C); wmTimer *wt= screen->animtimer; @@ -2968,7 +2970,7 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), wmEvent *e } /* next frame overriden by user action (pressed jump to first/last frame) */ - if(sad->flag & ANIMPLAY_FLAG_USE_NEXT_FRAME) { + if (sad->flag & ANIMPLAY_FLAG_USE_NEXT_FRAME) { scene->r.cfra = sad->nextfra; sad->flag &= ~ANIMPLAY_FLAG_USE_NEXT_FRAME; sad->flag |= ANIMPLAY_FLAG_JUMPED; @@ -3089,7 +3091,7 @@ static int screen_animation_cancel_exec(bContext *C, wmOperator *op) bScreen *screen= CTX_wm_screen(C); if (screen->animtimer) { - if(RNA_boolean_get(op->ptr, "restore_frame")) { + if (RNA_boolean_get(op->ptr, "restore_frame")) { ScreenAnimData *sad= screen->animtimer->customdata; Scene *scene= CTX_data_scene(C); @@ -3148,9 +3150,9 @@ static int border_select_do(bContext *C, wmOperator *op) { int event_type= RNA_int_get(op->ptr, "event_type"); - if(event_type==LEFTMOUSE) + if (event_type==LEFTMOUSE) printf("border select do select\n"); - else if(event_type==RIGHTMOUSE) + else if (event_type==RIGHTMOUSE) printf("border select deselect\n"); else printf("border select do something\n"); @@ -3312,17 +3314,17 @@ static int scene_new_exec(bContext *C, wmOperator *op) Main *bmain= CTX_data_main(C); int type= RNA_enum_get(op->ptr, "type"); - if(type == SCE_COPY_NEW) { + if (type == SCE_COPY_NEW) { newscene= add_scene("Scene"); } else { /* different kinds of copying */ newscene= copy_scene(scene, type); /* these can't be handled in blenkernel curently, so do them here */ - if(type == SCE_COPY_LINK_DATA) { + if (type == SCE_COPY_LINK_DATA) { ED_object_single_users(bmain, newscene, 0); } - else if(type == SCE_COPY_FULL) { + else if (type == SCE_COPY_FULL) { ED_object_single_users(bmain, newscene, 1); } } @@ -3368,7 +3370,7 @@ static int scene_delete_exec(bContext *C, wmOperator *UNUSED(op)) ED_screen_delete_scene(C, scene); - if(G.f & G_DEBUG) + if (G.f & G_DEBUG) printf("scene delete %p\n", scene); WM_event_add_notifier(C, NC_SCENE|NA_REMOVED, scene); @@ -3472,8 +3474,8 @@ static void keymap_modal_set(wmKeyConfig *keyconf) static int open_file_drop_poll(bContext *UNUSED(C), wmDrag *drag, wmEvent *UNUSED(event)) { - if(drag->type==WM_DRAG_PATH) { - if(drag->icon==ICON_FILE_BLEND) + if (drag->type==WM_DRAG_PATH) { + if (drag->icon==ICON_FILE_BLEND) return 1; } return 0; diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index ca5616f3502..e12e6b0ef82 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -106,14 +106,14 @@ static int screenshot_data_create(bContext *C, wmOperator *op) dumprect= screenshot(C, &dumpsx, &dumpsy); - if(dumprect) { + if (dumprect) { ScreenshotData *scd= MEM_callocN(sizeof(ScreenshotData), "screenshot"); ScrArea *sa= CTX_wm_area(C); scd->dumpsx= dumpsx; scd->dumpsy= dumpsy; scd->dumprect= dumprect; - if(sa) + if (sa) scd->crop= sa->totrct; op->customdata= scd; @@ -129,8 +129,8 @@ static void screenshot_data_free(wmOperator *op) { ScreenshotData *scd= op->customdata; - if(scd) { - if(scd->dumprect) + if (scd) { + if (scd->dumprect) MEM_freeN(scd->dumprect); MEM_freeN(scd); op->customdata= NULL; @@ -143,8 +143,8 @@ static void screenshot_crop(ImBuf *ibuf, rcti crop) unsigned int *from= ibuf->rect + crop.ymin*ibuf->x + crop.xmin; int y, cropw= crop.xmax - crop.xmin, croph = crop.ymax - crop.ymin; - if(cropw > 0 && croph > 0) { - for(y=0; y<croph; y++, to+=cropw, from+=ibuf->x) + if (cropw > 0 && croph > 0) { + for (y=0; y<croph; y++, to+=cropw, from+=ibuf->x) memmove(to, from, sizeof(unsigned int)*cropw); ibuf->x= cropw; @@ -156,14 +156,14 @@ static int screenshot_exec(bContext *C, wmOperator *op) { ScreenshotData *scd= op->customdata; - if(scd == NULL) { + if (scd == NULL) { /* when running exec directly */ screenshot_data_create(C, op); scd= op->customdata; } - if(scd) { - if(scd->dumprect) { + if (scd) { + if (scd->dumprect) { Scene *scene= CTX_data_scene(C); ImBuf *ibuf; char path[FILE_MAX]; @@ -174,15 +174,15 @@ static int screenshot_exec(bContext *C, wmOperator *op) BLI_path_abs(path, G.main->name); /* BKE_add_image_extension() checks for if extension was already set */ - if(scene->r.scemode & R_EXTENSION) - if(strlen(path)<FILE_MAX-5) + if (scene->r.scemode & R_EXTENSION) + if (strlen(path)<FILE_MAX-5) BKE_add_image_extension(path, scene->r.im_format.imtype); ibuf= IMB_allocImBuf(scd->dumpsx, scd->dumpsy, 24, 0); ibuf->rect= scd->dumprect; /* crop to show only single editor */ - if(!RNA_boolean_get(op->ptr, "full")) + if (!RNA_boolean_get(op->ptr, "full")) screenshot_crop(ibuf, scd->crop); BKE_write_ibuf(ibuf, path, &scene->r.im_format); @@ -197,8 +197,8 @@ static int screenshot_exec(bContext *C, wmOperator *op) static int screenshot_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) { - if(screenshot_data_create(C, op)) { - if(RNA_struct_property_is_set(op->ptr, "filepath")) + if (screenshot_data_create(C, op)) { + if (RNA_struct_property_is_set(op->ptr, "filepath")) return screenshot_exec(C, op); RNA_string_set(op->ptr, "filepath", G.ima); @@ -249,7 +249,7 @@ static void screenshot_freejob(void *sjv) { ScreenshotJob *sj= sjv; - if(sj->dumprect) + if (sj->dumprect) MEM_freeN(sj->dumprect); MEM_freeN(sj); @@ -262,7 +262,7 @@ static void screenshot_updatejob(void *sjv) ScreenshotJob *sj= sjv; unsigned int *dumprect; - if(sj->dumprect==NULL) { + if (sj->dumprect==NULL) { dumprect= MEM_mallocN(sizeof(int) * sj->dumpsx * sj->dumpsy, "dumprect"); glReadPixels(sj->x, sj->y, sj->dumpsx, sj->dumpsy, GL_RGBA, GL_UNSIGNED_BYTE, dumprect); glFinish(); @@ -283,8 +283,8 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float rd.frs_sec= U.scrcastfps; rd.frs_sec_base= 1.0f; - if(BKE_imtype_is_movie(rd.im_format.imtype)) { - if(!mh->start_movie(sj->scene, &rd, sj->dumpsx, sj->dumpsy, &sj->reports)) { + if (BKE_imtype_is_movie(rd.im_format.imtype)) { + if (!mh->start_movie(sj->scene, &rd, sj->dumpsx, sj->dumpsy, &sj->reports)) { printf("screencast job stopped\n"); return; } @@ -297,18 +297,20 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float *do_update= 1; // wait for opengl rect - while(*stop==0) { + while (*stop==0) { - if(sj->dumprect) { + if (sj->dumprect) { - if(mh) { - if(mh->append_movie(&rd, rd.sfra, rd.cfra, (int *)sj->dumprect, + if (mh) { + if (mh->append_movie(&rd, rd.sfra, rd.cfra, (int *)sj->dumprect, sj->dumpsx, sj->dumpsy, &sj->reports)) { BKE_reportf(&sj->reports, RPT_INFO, "Appended frame: %d", rd.cfra); printf("Appended frame %d\n", rd.cfra); - } else + } + else { break; + } } else { ImBuf *ibuf= IMB_allocImBuf(sj->dumpsx, sj->dumpsy, rd.im_format.planes, 0); @@ -320,7 +322,7 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float ibuf->rect= sj->dumprect; ok= BKE_write_ibuf(ibuf, name, &rd.im_format); - if(ok==0) { + if (ok==0) { printf("Write error: cannot save %s\n", name); BKE_reportf(&sj->reports, RPT_INFO, "Write error: cannot save %s\n", name); break; @@ -346,7 +348,7 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float PIL_sleep_ms(U.scrcastwait); } - if(mh) + if (mh) mh->end_movie(); BKE_report(&sj->reports, RPT_INFO, "Screencast job stopped"); @@ -359,7 +361,7 @@ static int screencast_exec(bContext *C, wmOperator *op) ScreenshotJob *sj= MEM_callocN(sizeof(ScreenshotJob), "screenshot job"); /* setup sj */ - if(RNA_boolean_get(op->ptr, "full")) { + if (RNA_boolean_get(op->ptr, "full")) { wmWindow *win= CTX_wm_window(C); sj->x= 0; sj->y= 0; |