Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-06-29 10:34:39 +0300
committerCampbell Barton <campbell@blender.org>2022-06-29 10:34:39 +0300
commitb1163d219824380263e0fd13098ac98a433567ac (patch)
tree7510241fd2eff3c04b53e597507fd8431eef4a43 /intern/mantaflow
parent66f826ae850849eb880b497b097c6287a627e61c (diff)
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
Diffstat (limited to 'intern/mantaflow')
-rw-r--r--intern/mantaflow/intern/MANTA_main.cpp6
1 files changed, 6 insertions, 0 deletions
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);