Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-10-31 14:46:38 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-10-31 15:34:23 +0300
commit39671ac5040f8d7856f7c0552ee6e75e9b721128 (patch)
treec1cfd78e8bdd9cd92cc605f332055e228657afb7 /intern
parent076abf6cd8c39b03d7a1e2b32cda213e97c8e6e8 (diff)
Fix crash of standalone app after recent refactor
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/app/cycles_standalone.cpp8
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.");