diff options
author | Sergey Sharybin <sergey@blender.org> | 2021-10-13 12:46:38 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2021-10-13 12:46:38 +0300 |
commit | 86536e785902c35a197bfef099693c00e8fc1bee (patch) | |
tree | 946157a39e204f747979c25e44154bdacbf1f96d /intern/cycles/blender | |
parent | f12513a21ccef5133baa4144074a8a20db2cc5b4 (diff) |
Fix Cycles assert in viewport after recent change
Create display early on, so that ready_to_reset() passes assert test
for use for display actually configured.
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r-- | intern/cycles/blender/blender_session.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 38dbb6ab8b1..8ecd7ee93d6 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -657,6 +657,8 @@ void BlenderSession::synchronize(BL::Depsgraph &b_depsgraph_) if (!b_v3d) return; + ensure_display_driver_if_needed(); + /* on session/scene parameter changes, we recreate session entirely */ const SessionParams session_params = BlenderSync::get_session_params( b_engine, b_userpref, b_scene, background); @@ -719,8 +721,6 @@ void BlenderSession::synchronize(BL::Depsgraph &b_depsgraph_) /* unlock */ session->scene->mutex.unlock(); - ensure_display_driver_if_needed(); - /* Start rendering thread, if it's not running already. Do this * after all scene data has been synced at least once. */ session->start(); |