Commit: 976b07056d3e7321c9494fab3f1a1a4ea0cde92c
Author: Campbell Barton
Date: Thu Sep 10 16:09:58 2020 +1000
Branches: master
https://developer.blender.org/rB976b07056d3e7321c9494fab3f1a1a4ea0cde92c
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 0126e5c8874..b68e1931670 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -723,7 +723,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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
