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:
authorRay Molenkamp <github@lazydodo.com>2019-11-23 19:21:34 +0300
committerRay Molenkamp <github@lazydodo.com>2019-11-23 19:21:34 +0300
commit44f18ce0a6e56156c3bd67f7080b06af11e502bf (patch)
treea9501dcc50358806e6d112f7a3c519774eab0fb2 /source/creator
parent373e936e3e642dd24e85910dc30b7fe4b0abf46c (diff)
Windows: Disable tbbmalloc for debug builds.
TBBMalloc seems to have a race condition somewhere on shutdown that seems to show up in debug builds only, ideally we find the issue and send a patch upstream but due to its racy nature it has eluded capture so far. This patch disables TBBMalloc for debug builds so that developers that actually need to get some work done can work without being bothered by this misbehaviour.
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/creator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c
index f6c2b707c8f..f4f5e3dcbde 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -29,7 +29,7 @@
# include "utfconv.h"
#endif
-#if defined(WITH_TBB_MALLOC) && defined(_MSC_VER)
+#if defined(WITH_TBB_MALLOC) && defined(_MSC_VER) && defined(NDEBUG)
# pragma comment(lib, "tbbmalloc_proxy.lib")
# pragma comment(linker, "/include:__TBB_malloc_proxy")
#endif