sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: metaballs called memcpy with NULL source

Browse Source 
Simplify logic and use realloc
This commit is contained in:
Campbell Barton 2015-06-03 12:35:37 +10:00
parent c0ca70a3b2
commit 4056253627
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/mball_tessellate.c
View File

@ -1233,14 +1233,9 @@ static void init_meta(EvaluationContext *eval_ctx, PROCESS *process, Scene *scen
copy_v3_v3(new_ml->bb->vec[6], tempmax);
/* add new_ml to mainb[] */
if (process->totelem == process->mem) {
MetaElem **newelem;
if (UNLIKELY(process->totelem == process->mem)) {
process->mem = process->mem * 2 + 10;
newelem = MEM_mallocN(sizeof(MetaElem *) * process->mem, "metaballs");
memcpy(newelem, process->mainb, sizeof(MetaElem *) * process->totelem);
if (process->mainb) MEM_freeN(process->mainb);
process->mainb = newelem;
process->mainb = MEM_reallocN(process->mainb, sizeof(MetaElem *) * process->mem);
}
process->mainb[process->totelem++] = new_ml;
}