diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-13 05:00:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-13 05:00:21 +0400 |
| commit | 96b2dc8e13ad6364c23119dcb909da785b5dca2b (patch) | |
| tree | 9b23a0ba827fec02d6628d654f7f5fe17d3b099e /source/blender/editors/screen | |
| parent | 0260e4b8a38cc567eda0679aaf7723ff442bdc34 (diff) | |
style cleanup: changes from recent commits
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 9a91e9d96cd..bf44e6be7b6 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -263,7 +263,7 @@ int scredge_is_horizontal(ScrEdge *se) ScrEdge *screen_find_active_scredge(bScreen *sc, int mx, int my) { ScrEdge *se; - int safety = U.widget_unit/10; + int safety = U.widget_unit / 10; if (safety < 2) safety = 2; diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 5a99fc7ae4c..6ca3c939124 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3600,13 +3600,14 @@ typedef struct RegionAlphaInfo { float ED_region_blend_factor(ARegion *ar) { /* check parent too */ - if(ar->regiontimer == NULL && (ar->alignment & RGN_SPLIT_PREV) && ar->prev) + if (ar->regiontimer == NULL && (ar->alignment & RGN_SPLIT_PREV) && ar->prev) { ar = ar->prev; - + } + if (ar->regiontimer) { RegionAlphaInfo *rgi = ar->regiontimer->customdata; float alpha; - + alpha = (float)ar->regiontimer->duration / TIMEOUT; /* makes sure the blend out works 100% - without area redraws */ if (rgi->hidden) alpha = 0.9f - TIMESTEP - alpha; @@ -3669,10 +3670,12 @@ void region_blend_start(bContext *C, ScrArea *sa, ARegion *ar) else WM_event_remove_handlers(C, &ar->handlers); - if(ar->next) - if (ar->next->alignment & RGN_SPLIT_PREV) + if (ar->next) { + if (ar->next->alignment & RGN_SPLIT_PREV) { rgi->child_ar = ar->next; - + } + } + /* new timer */ ar->regiontimer = WM_event_add_timer(wm, win, TIMERREGION, TIMESTEP); ar->regiontimer->customdata = rgi; |