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>2015-06-03 05:35:37 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-06-03 06:42:44 +0300
commit405625362710a3aceb0f76629aa63a8d25498e37 (patch)
tree25411c044fdd9cccdddd2af50fff8d23d38c72a9 /source/blender/blenkernel/intern/mball_tessellate.c
parentc0ca70a3b2a079cd4e3133b247843328c7fc49cf (diff)
Cleanup: metaballs called memcpy with NULL source
Simplify logic and use realloc
Diffstat (limited to 'source/blender/blenkernel/intern/mball_tessellate.c')
-rw-r--r--source/blender/blenkernel/intern/mball_tessellate.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/mball_tessellate.c b/source/blender/blenkernel/intern/mball_tessellate.c
index 080a8cead7b..e8418e876bb 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;
}