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 <ideasman42@gmail.com>2010-09-03 20:23:31 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-09-03 20:23:31 +0400
commit31331fb61d21de7df0066b2f51bc9906c95fc332 (patch)
treeb08bbcf116e8099c3cbfe205eb29614bcd477d82 /source/blender/blenkernel/intern/material.c
parent0cf0f5a62225f9f9cc2ed9715274e94dc09ad8b0 (diff)
error with allocating memory for a new material array (own fault in recent commit)
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r--source/blender/blenkernel/intern/material.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index beffd542427..7e52f746ebc 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -472,7 +472,7 @@ void material_append_id(ID *id, Material *ma)
Material ***matar;
if((matar= give_matarar_id(id))) {
short *totcol= give_totcolp_id(id);
- Material **mat= MEM_callocN(sizeof(void *) * (*totcol) + 1, "newmatar");
+ Material **mat= MEM_callocN(sizeof(void *) * ((*totcol) + 1), "newmatar");
if(*totcol) memcpy(mat, *matar, sizeof(void *) * (*totcol));
if(*matar) MEM_freeN(*matar);