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_sync.cpp | |
| parent | 59b730b64320a6746c73ac1a855188c9f1d5a2ad (diff) | |
| parent | ff1040c6fefc4c54fef243635a915edf3f40355a (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index f16305e737d..2605799f593 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -78,6 +78,14 @@ BlenderSync::~BlenderSync() { } +void BlenderSync::reset(BL::BlendData &b_data, BL::Scene &b_scene) +{ + /* Update data and scene pointers in case they change in session reset, + * for example after undo. */ + this->b_data = b_data; + this->b_scene = b_scene; +} + /* Sync */ void BlenderSync::sync_recalc(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d) |