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

Compile hair volumetrics code as C++, so we can use Eigen easier.

Browse Source
This commit is contained in:
Lukas Tönne 2014-11-06 15:05:42 +01:00
parent 46db288832
commit 9cd8e9f146
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/physics/CMakeLists.txt
View File

@ -41,7 +41,7 @@ set(INC_SYS
set(SRC
intern/BPH_mass_spring.cpp
intern/ConstrainedConjugateGradient.h
intern/hair_volume.c
intern/hair_volume.cpp
intern/implicit.h
intern/implicit_blender.c
intern/implicit_eigen.cpp

4
source/blender/physics/intern/hair_volume.c → source/blender/physics/intern/hair_volume.cpp
View File

@ -582,7 +582,7 @@ HairGrid *BPH_hair_volume_create_vertex_grid(float cellsize, const float gmin[3]
}
size = hair_grid_size(res);
grid = MEM_callocN(sizeof(HairGrid), "hair grid");
grid = (HairGrid *)MEM_callocN(sizeof(HairGrid), "hair grid");
grid->res[0] = res[0];
grid->res[1] = res[1];
grid->res[2] = res[2];
@ -590,7 +590,7 @@ HairGrid *BPH_hair_volume_create_vertex_grid(float cellsize, const float gmin[3]
copy_v3_v3(grid->gmax, gmax_margin);
grid->cellsize = cellsize;
grid->inv_cellsize = scale;
grid->verts = MEM_mallocN(sizeof(HairGridVert) * size, "hair voxel data");
grid->verts = (HairGridVert *)MEM_mallocN(sizeof(HairGridVert) * size, "hair voxel data");
/* initialize grid */
for (i = 0; i < size; ++i) {