[Bf-blender-cvs] [4056253] master: Cleanup: metaballs called memcpy with NULL source
Campbell Barton
noreply at git.blender.org
Wed Jun 3 06:11:45 CEST 2015
Commit: 405625362710a3aceb0f76629aa63a8d25498e37
Author: Campbell Barton
Date: Wed Jun 3 12:35:37 2015 +1000
Branches: master
https://developer.blender.org/rB405625362710a3aceb0f76629aa63a8d25498e37
Cleanup: metaballs called memcpy with NULL source
Simplify logic and use realloc
===================================================================
M source/blender/blenkernel/intern/mball_tessellate.c
===================================================================
diff --git a/source/blender/blenkernel/intern/mball_tessellate.c b/source/blender/blenkernel/intern/mball_tessellate.c
index 080a8ce..e8418e8 100644
--- a/source/blender/blenkernel/intern/mball_tessellate.c
+++ b/source/blender/blenkernel/intern/mball_tessellate.c
@@ -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;
}
More information about the Bf-blender-cvs
mailing list