diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-05-28 14:43:57 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-05-28 14:43:57 +0300 |
| commit | a9073ccb6895f188e43cfc6ddb507b5c1f69fc66 (patch) | |
| tree | 596ea8624459bc7669adc2430386f8c8628323dd /intern/cycles/blender/blender_session.cpp | |
| parent | 59b730b64320a6746c73ac1a855188c9f1d5a2ad (diff) | |
| parent | ff1040c6fefc4c54fef243635a915edf3f40355a (diff) | |
Merge branch 'blender-v2.83-release'
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 31b09695632..dbe87ce2b13 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"); |