[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41755] trunk/blender/source/blender/ editors/screen/screen_edit.c: Fix #29220 & #29221: missing cycles updates when switching scenes.

[Brecht Van Lommel]

Revision: 41755
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41755
Author:   blendix
Date:     2011-11-11 11:42:29 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
Fix #29220 & #29221: missing cycles updates when switching scenes.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_edit.c

Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c	2011-11-11 11:20:46 UTC (rev 41754)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c	2011-11-11 11:42:29 UTC (rev 41755)
@@ -59,6 +59,7 @@
 #include "ED_screen_types.h"
 #include "ED_fileselect.h"
 #include "ED_clip.h"
+#include "ED_render.h"
 
 #include "UI_interface.h"
 
@@ -1425,6 +1426,7 @@
 /* only call outside of area/region loops */
 void ED_screen_set_scene(bContext *C, Scene *scene)
 {
+	Main *bmain= CTX_data_main(C);
 	bScreen *sc;
 	bScreen *curscreen= CTX_wm_screen(C);
 	
@@ -1484,9 +1486,10 @@
 	}
 	
 	CTX_data_scene_set(C, scene);
-	set_scene_bg(CTX_data_main(C), scene);
+	set_scene_bg(bmain, scene);
 	
-	ED_update_for_newframe(CTX_data_main(C), scene, curscreen, 1);
+	ED_render_engine_changed(bmain);
+	ED_update_for_newframe(bmain, scene, curscreen, 1);
 	
 	/* complete redraw */
 	WM_event_add_notifier(C, NC_WINDOW, NULL);