diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-05-27 19:00:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-05-27 19:03:17 +0300 |
| commit | 79e529c5ec16d644693c1a71790819e020a293cd (patch) | |
| tree | d9f79458ddc5374ff120057149d667c43dd63710 /intern/cycles/blender/blender_session.cpp | |
| parent | 735119dd0f91b60c827278947afc8544446a7658 (diff) | |
Fix T77109: Cycles viewport render crash after object add and undo
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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"); |