diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-11-06 17:05:42 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:30:06 +0300 |
commit | 9cd8e9f146b373e17d36d9ba8b82d2f7f6ec919c (patch) | |
tree | e33bc78c36361b82b6e4aabc4844fe2c354c12e1 /source/blender/physics | |
parent | 46db2888327a212ef6b3bbb4d16360f7b9e563c7 (diff) |
Compile hair volumetrics code as C++, so we can use Eigen easier.
Diffstat (limited to 'source/blender/physics')
-rw-r--r-- | source/blender/physics/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/physics/intern/hair_volume.cpp (renamed from source/blender/physics/intern/hair_volume.c) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/physics/CMakeLists.txt b/source/blender/physics/CMakeLists.txt index 5df32c2ea32..018535cc2ab 100644 --- a/source/blender/physics/CMakeLists.txt +++ b/source/blender/physics/CMakeLists.txt @@ -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 diff --git a/source/blender/physics/intern/hair_volume.c b/source/blender/physics/intern/hair_volume.cpp index 0713878239f..23abe917935 100644 --- a/source/blender/physics/intern/hair_volume.c +++ b/source/blender/physics/intern/hair_volume.cpp @@ -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) { |