Merge branch 'master' into blender2.8

1 files changed, 2 insertions, 6 deletions

diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index 939c6cf7eb5..0b9a4042e0e 100644
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@ -130,11 +130,11 @@ static void session_init()
 		options.session->progress.set_update_callback(function_bind(&view_redraw));
 #endif
 
-	options.session->start();
-
 	/* load scene */
 	scene_init();
 	options.session->scene = options.scene;
+
+	options.session->start();
 }
 
 static void session_exit()
@@ -143,10 +143,6 @@ static void session_exit()
 		delete options.session;
 		options.session = NULL;
 	}
-	if(options.scene) {
-		delete options.scene;
-		options.scene = NULL;
-	}
 
 	if(options.session_params.background && !options.quiet) {
 		session_print("Finished Rendering.");