forked from bartvdbraak/blender
Compile hair volumetrics code as C++, so we can use Eigen easier.
This commit is contained in:
parent
46db288832
commit
9cd8e9f146
@ -41,7 +41,7 @@ set(INC_SYS
|
|||||||
set(SRC
|
set(SRC
|
||||||
intern/BPH_mass_spring.cpp
|
intern/BPH_mass_spring.cpp
|
||||||
intern/ConstrainedConjugateGradient.h
|
intern/ConstrainedConjugateGradient.h
|
||||||
intern/hair_volume.c
|
intern/hair_volume.cpp
|
||||||
intern/implicit.h
|
intern/implicit.h
|
||||||
intern/implicit_blender.c
|
intern/implicit_blender.c
|
||||||
intern/implicit_eigen.cpp
|
intern/implicit_eigen.cpp
|
||||||
|
@ -582,7 +582,7 @@ HairGrid *BPH_hair_volume_create_vertex_grid(float cellsize, const float gmin[3]
|
|||||||
}
|
}
|
||||||
size = hair_grid_size(res);
|
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[0] = res[0];
|
||||||
grid->res[1] = res[1];
|
grid->res[1] = res[1];
|
||||||
grid->res[2] = res[2];
|
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);
|
copy_v3_v3(grid->gmax, gmax_margin);
|
||||||
grid->cellsize = cellsize;
|
grid->cellsize = cellsize;
|
||||||
grid->inv_cellsize = scale;
|
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 */
|
/* initialize grid */
|
||||||
for (i = 0; i < size; ++i) {
|
for (i = 0; i < size; ++i) {
|
Loading…
Reference in New Issue
Block a user