From 86536e785902c35a197bfef099693c00e8fc1bee Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 13 Oct 2021 11:46:38 +0200 Subject: 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. --- intern/cycles/blender/blender_session.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/cycles/blender') 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(); -- cgit v1.2.3