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:
authorTon Roosendaal <ton@blender.org>2006-07-22 21:04:18 +0400
committerTon Roosendaal <ton@blender.org>2006-07-22 21:04:18 +0400
commit56322ca051d893d15890a566b023257d5fd54471 (patch)
treec1f0ba2d381fb9ddc8c0a66eb103bad3cafe6208 /intern
parentbd8cd6a38c27cc8cf72c4977e0c102f19eaf1f29 (diff)
Minor fix: default name for dupli-alloc was mixed up, using mapalloc for
malloc, and vice versa.
Diffstat (limited to 'intern')
-rw-r--r--intern/guardedalloc/intern/mallocn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index 39cf77fc72e..752efd6ccb8 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -188,9 +188,9 @@ void *MEM_dupallocN(void *vmemh)
memh--;
if(memh->mmap)
- newp= MEM_mapallocN(memh->len, "dupli_alloc");
+ newp= MEM_mapallocN(memh->len, "dupli_mapalloc");
else
- newp= MEM_mallocN(memh->len, "dupli_mapalloc");
+ newp= MEM_mallocN(memh->len, "dupli_alloc");
memcpy(newp, vmemh, memh->len);
}