Fix T55991: Python ignores scene switch argument

1 files changed, 12 insertions, 0 deletions

diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index b78e76f6ba3..22301bd62f5 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -60,6 +60,8 @@
 #include "BKE_sound.h"
 #include "BKE_image.h"
 
+#include "DNA_screen_types.h"
+
 #include "DEG_depsgraph.h"
 
 #ifdef WITH_FFMPEG
@@ -1588,6 +1590,16 @@ static int arg_handle_scene_set(int argc, const char **argv, void *data)
 		Scene *scene = BKE_scene_set_name(CTX_data_main(C), argv[1]);
 		if (scene) {
 			CTX_data_scene_set(C, scene);
+
+			/* Set the scene of the first window, see: T55991,
+			 * otherwise scrips that run later won't get this scene back from the context. */
+			wmWindow *win = CTX_wm_window(C);
+			if (win == NULL) {
+				win = CTX_wm_manager(C)->windows.first;
+			}
+			if (win != NULL) {
+				win->screen->scene = scene;
+			}
 		}
 		return 1;
 	}