archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-01-18 00:58:54 +01:00
parent 8400b4b566 e6df02861e
commit 27dff3fbc1
81 changed files with 1007 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/modifiers/intern/MOD_laplaciansmooth.c
View File

@@ -132,14 +132,14 @@ static LaplacianSystem *init_laplacian_system(int a_numEdges, int a_numPolys, in
sys->numLoops = a_numLoops;
sys->numVerts = a_numVerts;
sys->eweights = MEM_callocN(sizeof(float) * sys->numEdges, __func__);
sys->fweights = MEM_callocN(sizeof(float[3]) * sys->numLoops, __func__);
sys->numNeEd = MEM_callocN(sizeof(short) * sys->numVerts, __func__);
sys->numNeFa = MEM_callocN(sizeof(short) * sys->numVerts, __func__);
sys->ring_areas = MEM_callocN(sizeof(float) * sys->numVerts, __func__);
sys->vlengths = MEM_callocN(sizeof(float) * sys->numVerts, __func__);
sys->vweights = MEM_callocN(sizeof(float) * sys->numVerts, __func__);
sys->zerola = MEM_callocN(sizeof(short) * sys->numVerts, __func__);
sys->eweights = MEM_calloc_arrayN(sys->numEdges, sizeof(float), __func__);
sys->fweights = MEM_calloc_arrayN(sys->numLoops, sizeof(float[3]), __func__);
sys->numNeEd = MEM_calloc_arrayN(sys->numVerts, sizeof(short), __func__);
sys->numNeFa = MEM_calloc_arrayN(sys->numVerts, sizeof(short), __func__);
sys->ring_areas = MEM_calloc_arrayN(sys->numVerts, sizeof(float), __func__);
sys->vlengths = MEM_calloc_arrayN(sys->numVerts, sizeof(float), __func__);
sys->vweights = MEM_calloc_arrayN(sys->numVerts, sizeof(float), __func__);
sys->zerola = MEM_calloc_arrayN(sys->numVerts, sizeof(short), __func__);
return sys;
}