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
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-02-13 16:38:10 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-02-13 16:38:10 +0300
commit39c3ebdc910100a3194f62ac52af4e15a9422264 (patch)
treeab057fa4b8e7f7d9ac81dd845e34974fcbd34375 /intern
parent4be8384e2798c2b3bc9fab4e04b7404bda152d5e (diff)
fix for memory leak: node animation data wasnt being free'd
also some corrections to memory debug stuff.
Diffstat (limited to 'intern')
-rw-r--r--intern/guardedalloc/intern/mallocn.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index c90cbf65c4d..677d756c8e6 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -305,9 +305,9 @@ void *MEM_mallocN(unsigned int len, const char *str)
memset(memh+1, 255, len);
#ifdef DEBUG_MEMCOUNTER
- memh->_count= _mallocn_count++;
if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
memcount_raise("MEM_mallocN");
+ memh->_count= _mallocn_count++;
#endif
return (++memh);
}
@@ -330,9 +330,9 @@ void *MEM_callocN(unsigned int len, const char *str)
make_memhead_header(memh, len, str);
mem_unlock_thread();
#ifdef DEBUG_MEMCOUNTER
- memh->_count= _mallocn_count++;
if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
memcount_raise("MEM_callocN");
+ memh->_count= _mallocn_count++;
#endif
return (++memh);
}
@@ -372,9 +372,9 @@ void *MEM_mapallocN(unsigned int len, const char *str)
mmap_in_use += len;
mem_unlock_thread();
#ifdef DEBUG_MEMCOUNTER
- memh->_count= _mallocn_count++;
if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
memcount_raise("MEM_mapallocN");
+ memh->_count= _mallocn_count++;
#endif
return (++memh);
}