Merged changes in the trunk up to revision 27817.

1 files changed, 6 insertions, 2 deletions

diff --git a/source/creator/creator.c b/source/creator/creator.c
index 536d380fdbc..b4158483cef 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -681,7 +681,7 @@ static int render_frame(int argc, char **argv, void *data)
 
 		if (argc > 1) {
 			int frame = atoi(argv[1]);
-			Render *re = RE_NewRender(scene->id.name, RE_SLOT_DEFAULT);
+			Render *re = RE_NewRender(scene->id.name);
 			ReportList reports;
 
 			BKE_reports_init(&reports, RPT_PRINT);
@@ -705,7 +705,7 @@ static int render_animation(int argc, char **argv, void *data)
 	bContext *C = data;
 	if (CTX_data_scene(C)) {
 		Scene *scene= CTX_data_scene(C);
-		Render *re= RE_NewRender(scene->id.name, RE_SLOT_DEFAULT);
+		Render *re= RE_NewRender(scene->id.name);
 		ReportList reports;
 		BKE_reports_init(&reports, RPT_PRINT);
 		RE_BlenderAnim(re, scene, scene->lay, scene->r.sfra, scene->r.efra, scene->r.frame_step, &reports);
@@ -798,6 +798,7 @@ static int run_python(int argc, char **argv, void *data)
 		/* XXX, temp setting the WM is ugly, splash also does this :S */
 		wmWindowManager *wm= CTX_wm_manager(C);
 		wmWindow *prevwin= CTX_wm_window(C);
+		Scene *prevscene= CTX_data_scene(C);
 
 		if(wm->windows.first) {
 			CTX_wm_window_set(C, wm->windows.first);
@@ -810,6 +811,9 @@ static int run_python(int argc, char **argv, void *data)
 			fprintf(stderr, "Python script \"%s\" running with missing context data.\n", argv[1]);
 			BPY_run_python_script(C, filename, NULL, NULL); // use reports?
 		}
+
+		CTX_data_scene_set(C, prevscene);
+
 		return 1;
 	} else {
 		printf("\nError: you must specify a Python script after '-P '.\n");