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

Fix [#20538] exiting render turns my UV/image editor back to a 3d view

Browse Source
This commit is contained in:
Matt Ebb
2010-01-22 01:02:11 +00:00
parent 3e95d9cf65
commit 2c565ec48a
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2774,6 +2774,7 @@ static void screen_set_image_output(bContext *C, int mx, int my)
Scene *scene= CTX_data_scene(C);
ScrArea *sa= NULL;
SpaceImage *sima;
int area_was_image=0;
if(scene->r.displaymode==R_OUTPUT_WINDOW) {
rcti rect;
@@ -2798,6 +2799,9 @@ static void screen_set_image_output(bContext *C, int mx, int my)
sa= CTX_wm_area(C);
}
else if(scene->r.displaymode==R_OUTPUT_SCREEN) {
if (CTX_wm_area(C)->spacetype == SPACE_IMAGE)
area_was_image = 1;
/* this function returns with changed context */
ED_screen_full_newspace(C, CTX_wm_area(C), SPACE_IMAGE);
sa= CTX_wm_area(C);
@@ -2836,14 +2840,24 @@ static void screen_set_image_output(bContext *C, int mx, int my)
/* get the correct image, and scale it */
sima->image= BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
// if(G.displaymode==2) { // XXX
if(sa->full) {
sima->flag |= SI_FULLWINDOW|SI_PREVSPACE;
// ed_screen_fullarea(C, win, sa);
}
// }
/* if we're rendering to full screen, set appropriate hints on image editor
* so it can restore properly on pressing esc */
if(sa->full) {
sima->flag |= SI_FULLWINDOW;
/* Tell the image editor to revert to previous space in space list on close
* _only_ if it wasn't already an image editor when the render was invoked */
if (area_was_image == 0)
sima->flag |= SI_PREVSPACE;
else {
/* Leave it alone so the image editor will just go back from
* full screen to the original tiled setup */
;
}
}
}
/* executes blocking render */