[Bf-blender-cvs] [b1163d21982] master: Mantaflow: disable call to MANTA::terminateMantaflow
Campbell Barton
noreply at git.blender.org
Wed Jun 29 09:55:06 CEST 2022
Commit: b1163d219824380263e0fd13098ac98a433567ac
Author: Campbell Barton
Date: Wed Jun 29 17:34:39 2022 +1000
Branches: master
https://developer.blender.org/rBb1163d219824380263e0fd13098ac98a433567ac
Mantaflow: disable call to MANTA::terminateMantaflow
Effectively revert [0] as it ran when freeing individual modifiers,
causing a crash on exit in one of the cycles_volume_cpu tests.
[0]: 6777c420dbb92523ca9c2acd1fa1f8abce98f88d
===================================================================
M intern/mantaflow/intern/MANTA_main.cpp
===================================================================
diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index f1bdc10e7f9..fc14c909f4d 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -562,7 +562,13 @@ MANTA::~MANTA()
pythonCommands.push_back(finalString);
result = runPythonString(pythonCommands);
+ /* WARNING: this causes crash on exit in the `cycles_volume_cpu/smoke_color` test,
+ * freeing a single modifier ends up clearing the shared module.
+ * For this to be handled properly there would need to be a initialize/free
+ * function for global data. */
+#if 0
MANTA::terminateMantaflow();
+#endif
BLI_assert(result);
UNUSED_VARS(result);
More information about the Bf-blender-cvs
mailing list