[Bf-blender-cvs] [39671ac5040] master: Fix crash of standalone app after recent refactor

Sergey Sharybin noreply at git.blender.org
Tue Oct 31 13:34:49 CET 2017


Commit: 39671ac5040f8d7856f7c0552ee6e75e9b721128
Author: Sergey Sharybin
Date:   Tue Oct 31 12:46:38 2017 +0100
Branches: master
https://developer.blender.org/rB39671ac5040f8d7856f7c0552ee6e75e9b721128

Fix crash of standalone app after recent refactor

===================================================================

M	intern/cycles/app/cycles_standalone.cpp

===================================================================

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.");



More information about the Bf-blender-cvs mailing list