Fix #29220 & #29221: missing cycles updates when switching scenes.

1 files changed, 5 insertions, 2 deletions

diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index a76be0c3c42..3a0202ad546 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -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 @@ void ED_screen_delete(bContext *C, bScreen *sc)
 /* 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 @@ void ED_screen_set_scene(bContext *C, Scene *scene)
 	}
 	
 	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);