From 79e529c5ec16d644693c1a71790819e020a293cd Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 27 May 2020 18:00:59 +0200 Subject: Fix T77109: Cycles viewport render crash after object add and undo --- intern/cycles/blender/blender_session.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'intern/cycles/blender/blender_session.cpp') diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 5ea96d6bdfd..ed90d054d73 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -168,9 +168,13 @@ void BlenderSession::create_session() void BlenderSession::reset_session(BL::BlendData &b_data, BL::Depsgraph &b_depsgraph) { + /* Update data, scene and depsgraph pointers. These can change after undo. */ this->b_data = b_data; this->b_depsgraph = b_depsgraph; this->b_scene = b_depsgraph.scene_eval(); + if (sync) { + sync->reset(this->b_data, this->b_scene); + } if (preview_osl) { PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles"); -- cgit v1.2.3