[Bf-blender-cvs] [5f66510a212] blender-v2.90-release: Fix T71012: Cycles baking crash with locked-UI & background-mode
Campbell Barton
noreply at git.blender.org
Mon Sep 21 09:50:33 CEST 2020
Commit: 5f66510a212d70a516f31ce3d9dec3ca495a04e7
Author: Campbell Barton
Date: Thu Sep 10 16:09:58 2020 +1000
Branches: blender-v2.90-release
https://developer.blender.org/rB5f66510a212d70a516f31ce3d9dec3ca495a04e7
Fix T71012: Cycles baking crash with locked-UI & background-mode
===================================================================
M intern/cycles/blender/blender_sync.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 511061db08a..44bf6f59899 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -717,7 +717,11 @@ void BlenderSync::free_data_after_sync(BL::Depsgraph &b_depsgraph)
* footprint during synchronization process.
*/
const bool is_interface_locked = b_engine.render() && b_engine.render().use_lock_interface();
- const bool can_free_caches = BlenderSession::headless || is_interface_locked;
+ const bool can_free_caches = (BlenderSession::headless || is_interface_locked) &&
+ /* Baking re-uses the depsgraph multiple times, clearing crashes
+ * reading un-evaluated mesh data which isn't aligned with the
+ * geometry we're baking, see T71012. */
+ !scene->bake_manager->get_baking();
if (!can_free_caches) {
return;
}
More information about the Bf-blender-cvs
mailing list