Revision: 33887
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33887
Author: ton
Date: 2010-12-24 14:24:26 +0100 (Fri, 24 Dec 2010)
Log Message:
-----------
Bugfix #25357
Having 2 windows open, rendering to image editor, activate other
window and press F11 -> UI went haywire. Simple fix prevents
render output to be closed in this case.
Modified Paths:
--------------
trunk/blender/source/blender/editors/render/render_internal.c
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c
2010-12-24 12:50:07 UTC (rev 33886)
+++ trunk/blender/source/blender/editors/render/render_internal.c
2010-12-24 13:24:26 UTC (rev 33887)
@@ -866,24 +866,27 @@
/* determine if render already shows */
if(sa) {
- SpaceImage *sima= sa->spacedata.first;
+ /* but don't close it when rendering */
+ if(!G.rendering) {
+ SpaceImage *sima= sa->spacedata.first;
- if(sima->flag & SI_PREVSPACE) {
- sima->flag &= ~SI_PREVSPACE;
+ if(sima->flag & SI_PREVSPACE) {
+ sima->flag &= ~SI_PREVSPACE;
- if(sima->flag & SI_FULLWINDOW) {
- sima->flag &= ~SI_FULLWINDOW;
- ED_screen_full_prevspace(C, sa);
+ if(sima->flag & SI_FULLWINDOW) {
+ sima->flag &= ~SI_FULLWINDOW;
+ ED_screen_full_prevspace(C, sa);
+ }
+ else if(sima->next) {
+ /* workaround for case of
double prevspace, render window
+ with a file browser on top
of it (same as in ED_area_prevspace) */
+ if(sima->next->spacetype ==
SPACE_FILE && sima->next->next)
+ ED_area_newspace(C, sa,
sima->next->next->spacetype);
+ else
+ ED_area_newspace(C, sa,
sima->next->spacetype);
+ ED_area_tag_redraw(sa);
+ }
}
- else if(sima->next) {
- /* workaround for case of double
prevspace, render window
- with a file browser on top of it
(same as in ED_area_prevspace) */
- if(sima->next->spacetype == SPACE_FILE
&& sima->next->next)
- ED_area_newspace(C, sa,
sima->next->next->spacetype);
- else
- ED_area_newspace(C, sa,
sima->next->spacetype);
- ED_area_tag_redraw(sa);
- }
}
}
else {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
