Commit: 86536e785902c35a197bfef099693c00e8fc1bee
Author: Sergey Sharybin
Date: Wed Oct 13 11:46:38 2021 +0200
Branches: master
https://developer.blender.org/rB86536e785902c35a197bfef099693c00e8fc1bee
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.
===================================================================
M intern/cycles/blender/blender_session.cpp
===================================================================
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();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
