diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-04-30 01:48:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-30 02:11:47 +0400 |
| commit | 48446870a8981c28ee4c695823d12fb4419e56eb (patch) | |
| tree | a9b80b92be135af86d451b60a6b55a4e33bf0fb0 /source/blender/editors/render/render_view.c | |
| parent | cdaff060265ef81539d04f6ad1f16762dbbba288 (diff) | |
Code cleanup: remove redundant CTX calls
Diffstat (limited to 'source/blender/editors/render/render_view.c')
| -rw-r--r-- | source/blender/editors/render/render_view.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index 80ce74f3c5b..09b82733178 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -167,11 +167,12 @@ ScrArea *render_view_open(bContext *C, int mx, int my) sa = CTX_wm_area(C); } else if (scene->r.displaymode == R_OUTPUT_SCREEN) { - if (CTX_wm_area(C) && CTX_wm_area(C)->spacetype == SPACE_IMAGE) - area_was_image = 1; + sa = CTX_wm_area(C); + if (sa && sa->spacetype == SPACE_IMAGE) + area_was_image = true; /* this function returns with changed context */ - sa = ED_screen_full_newspace(C, CTX_wm_area(C), SPACE_IMAGE); + sa = ED_screen_full_newspace(C, sa, SPACE_IMAGE); } if (!sa) { @@ -239,8 +240,8 @@ static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op)) SpaceImage *sima = sa->spacedata.first; /* test if we have a temp screen in front */ - if (CTX_wm_window(C)->screen->temp) { - wm_window_lower(CTX_wm_window(C)); + if (win->screen->temp) { + wm_window_lower(win); return OPERATOR_FINISHED; } /* determine if render already shows */ |