[Bf-blender-cvs] [9cd8e9f] master: Compile hair volumetrics code as C++, so we can use Eigen easier.
Lukas Tönne
noreply at git.blender.org
Tue Jan 20 09:52:28 CET 2015
Commit: 9cd8e9f146b373e17d36d9ba8b82d2f7f6ec919c
Author: Lukas Tönne
Date: Thu Nov 6 15:05:42 2014 +0100
Branches: master
https://developer.blender.org/rB9cd8e9f146b373e17d36d9ba8b82d2f7f6ec919c
Compile hair volumetrics code as C++, so we can use Eigen easier.
===================================================================
M source/blender/physics/CMakeLists.txt
D source/blender/physics/intern/hair_volume.c
A source/blender/physics/intern/hair_volume.cpp
===================================================================
diff --git a/source/blender/physics/CMakeLists.txt b/source/blender/physics/CMakeLists.txt
index 5df32c2..018535c 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
similarity index 99%
rename from source/blender/physics/intern/hair_volume.c
rename to source/blender/physics/intern/hair_volume.cpp
index 0713878..23abe91 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) {
More information about the Bf-blender-cvs
mailing list