diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-09 19:20:58 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-09 19:20:58 +0300 |
| commit | 60799d6fee256427bcac7c0ca30d5197b4eddbc1 (patch) | |
| tree | 62a9c42a0b5b376097c64788228d7b27b97d2cce /intern/cycles/blender/blender_session.cpp | |
| parent | 513bc5954c714edfbc4a48dff118ac6b83f9a7bb (diff) | |
| parent | 49e3f08815af17704e94c0e9eba0c6228a43972a (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index f84eefd0233..c634926ea9f 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -114,9 +114,6 @@ BlenderSession::~BlenderSession() void BlenderSession::create() { create_session(); - - if(b_v3d) - session->start(); } void BlenderSession::create_session() @@ -804,7 +801,6 @@ void BlenderSession::synchronize(BL::Depsgraph& b_depsgraph_) { free_session(); create_session(); - session->start(); return; } @@ -857,6 +853,10 @@ void BlenderSession::synchronize(BL::Depsgraph& b_depsgraph_) /* reset time */ start_resize_time = 0.0; } + + /* Start rendering thread, if it's not running already. Do this + * after all scene data has been synced at least once. */ + session->start(); } bool BlenderSession::draw(int w, int h) |