diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-13 14:37:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-13 14:37:04 +0400 |
| commit | 60808c5ed6a3b38ffefcdc4714ebdd5a2ae6d327 (patch) | |
| tree | 087cdd1773e561ad9b99ec0b5afcffff84bf65de /intern/guardedalloc | |
| parent | b83f105588f2c1d72e185dd9431ffb855a213123 (diff) | |
disable openmp thread assert, would fail in cases where the caller was locking for its self (sculpt mode)
Diffstat (limited to 'intern/guardedalloc')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 59e780f21e5..d747f042cbc 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -113,11 +113,14 @@ typedef struct MemHead { /* for openmp threading asserts, saves time troubleshooting * we may need to extend this if blender code starts using MEM_ * functions inside OpenMP correctly with omp_set_lock() */ + +#if 0 /* disable for now, only use to debug openmp code which doesn lock threads for malloc */ #if defined(_OPENMP) && defined(DEBUG) # include <assert.h> # include <omp.h> # define DEBUG_OMP_MALLOC #endif +#endif typedef struct MemTail { int tag3, pad; |