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

Bake-API: replacing some MEM_callocN by MEM_mallocN

Browse Source 
As suggested and reviewed by Campbell Barton. This is the most trivial of the cases. I will look if I can do it elsewhere in the bake code
This commit is contained in:
Dalai Felinto 2014-05-29 23:18:21 -03:00
parent 2a9efa4e51
commit 50a7843ab1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/render/intern/source/bake_api.c
View File

@ -395,8 +395,8 @@ void RE_bake_pixels_populate_from_objects(
TriTessFace **tris_high; TriTessFace **tris_high;
/* assume all lowpoly tessfaces can be quads */ /* assume all lowpoly tessfaces can be quads */
tris_low = MEM_callocN(sizeof(TriTessFace) * (me_low->totface * 2), "MVerts Lowpoly Mesh"); tris_low = MEM_mallocN(sizeof(TriTessFace) * (me_low->totface * 2), "MVerts Lowpoly Mesh");
tris_high = MEM_callocN(sizeof(TriTessFace *) * tot_highpoly, "MVerts Highpoly Mesh Array"); tris_high = MEM_mallocN(sizeof(TriTessFace *) * tot_highpoly, "MVerts Highpoly Mesh Array");
/* assume all highpoly tessfaces are triangles */ /* assume all highpoly tessfaces are triangles */
dm_highpoly = MEM_callocN(sizeof(DerivedMesh *) * tot_highpoly, "Highpoly Derived Meshes"); dm_highpoly = MEM_callocN(sizeof(DerivedMesh *) * tot_highpoly, "Highpoly Derived Meshes");
@ -407,7 +407,7 @@ void RE_bake_pixels_populate_from_objects(
invert_m4_m4(imat_low, mat_low); invert_m4_m4(imat_low, mat_low);
for (i = 0; i < tot_highpoly; i++) { for (i = 0; i < tot_highpoly; i++) {
tris_high[i] = MEM_callocN(sizeof(TriTessFace) * highpoly[i].me->totface, "MVerts Highpoly Mesh"); tris_high[i] = MEM_mallocN(sizeof(TriTessFace) * highpoly[i].me->totface, "MVerts Highpoly Mesh");
mesh_calc_tri_tessface(tris_high[i], highpoly[i].me, false, NULL); mesh_calc_tri_tessface(tris_high[i], highpoly[i].me, false, NULL);
dm_highpoly[i] = CDDM_from_mesh(highpoly[i].me); dm_highpoly[i] = CDDM_from_mesh(highpoly[i].me);
@ -628,7 +628,7 @@ void RE_bake_normal_world_to_tangent(
DerivedMesh *dm = CDDM_from_mesh(me); DerivedMesh *dm = CDDM_from_mesh(me);
triangles = MEM_callocN(sizeof(TriTessFace) * (me->totface * 2), "MVerts Mesh"); triangles = MEM_mallocN(sizeof(TriTessFace) * (me->totface * 2), "MVerts Mesh");
mesh_calc_tri_tessface(triangles, me, true, dm); mesh_calc_tri_tessface(triangles, me, true, dm);
BLI_assert(num_pixels >= 3); BLI_assert(num_pixels >= 3);