[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57229] trunk/blender/source/blender/ windowmanager/intern/wm_window.c: Fix #35624: rendering to a new window, then switching scene in the main window,

Brecht Van Lommel brechtvanlommel at pandora.be
Tue Jun 4 17:36:00 CEST 2013


Revision: 57229
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57229
Author:   blendix
Date:     2013-06-04 15:36:00 +0000 (Tue, 04 Jun 2013)
Log Message:
-----------
Fix #35624: rendering to a new window, then switching scene in the main window,
would still continue to render the previous scene in the render window on F12.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_window.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c	2013-06-04 11:21:13 UTC (rev 57228)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c	2013-06-04 15:36:00 UTC (rev 57229)
@@ -525,6 +525,7 @@
 {
 	wmWindow *win;
 	ScrArea *sa;
+	Scene *scene = CTX_data_scene(C);
 	
 	/* changes rect to fit within desktop */
 	wm_window_check_position(position);
@@ -550,9 +551,16 @@
 		wm_window_raise(win);
 	}
 	
-	/* add new screen? */
-	if (win->screen == NULL)
-		win->screen = ED_screen_add(win, CTX_data_scene(C), "temp");
+	if (win->screen == NULL) {
+		/* add new screen */
+		win->screen = ED_screen_add(win, scene, "temp");
+	}
+	else {
+		/* switch scene for rendering */
+		if (win->screen->scene != scene)
+			ED_screen_set_scene(C, win->screen, scene);
+	}
+
 	win->screen->temp = 1; 
 	
 	/* make window active, and validate/resize */




More information about the Bf-blender-cvs mailing list