4 files changed, 0 insertions, 78 deletions

diff --git a/source/blender/physics/BPH_mass_spring.h b/source/blender/physics/BPH_mass_spring.h
index c650d83c927..e89aec1456e 100644
--- a/source/blender/physics/BPH_mass_spring.h
+++ b/source/blender/physics/BPH_mass_spring.h
@@ -58,8 +58,6 @@ void BPH_cloth_solver_free(struct ClothModifierData *clmd);
 int BPH_cloth_solve(struct Object *ob, float frame, struct ClothModifierData *clmd, struct ListBase *effectors);
 void BKE_cloth_solver_set_positions(struct ClothModifierData *clmd);
 
-bool BPH_cloth_solver_get_texture_data(struct Object *ob, struct ClothModifierData *clmd, struct VoxelData *vd);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp
index 5b5639495da..e5724c97bbc 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -1091,24 +1091,3 @@ int BPH_cloth_solve(Object *ob, float frame, ClothModifierData *clmd, ListBase *
 	
 	return 1;
 }
-
-bool BPH_cloth_solver_get_texture_data(Object *UNUSED(ob), ClothModifierData *clmd, VoxelData *vd)
-{
-	Cloth *cloth = clmd->clothObject;
-	HairGrid *grid;
-	float gmin[3], gmax[3];
-	
-	if (!clmd->clothObject || !clmd->clothObject->implicit)
-		return false;
-	
-	hair_get_boundbox(clmd, gmin, gmax);
-	
-	grid = BPH_hair_volume_create_vertex_grid(clmd->sim_parms->voxel_cell_size, gmin, gmax);
-	cloth_continuum_fill_grid(grid, cloth);
-	
-	BPH_hair_volume_get_texture_data(grid, vd);
-	
-	BPH_hair_volume_free_vertex_grid(grid);
-	
-	return true;
-}
diff --git a/source/blender/physics/intern/hair_volume.cpp b/source/blender/physics/intern/hair_volume.cpp
index ad6fbed32e0..6ab69a0050c 100644
--- a/source/blender/physics/intern/hair_volume.cpp
+++ b/source/blender/physics/intern/hair_volume.cpp
@@ -1099,56 +1099,3 @@ static HairGridVert *hair_volume_create_collision_grid(ClothModifierData *clmd,
 	return collgrid;
 }
 #endif
-
-bool BPH_hair_volume_get_texture_data(HairGrid *grid, VoxelData *vd)
-{
-	int totres, i;
-	int depth;
-
-	vd->resol[0] = grid->res[0];
-	vd->resol[1] = grid->res[1];
-	vd->resol[2] = grid->res[2];
-	
-	totres = hair_grid_size(grid->res);
-	
-	if (vd->hair_type == TEX_VD_HAIRVELOCITY) {
-		depth = 4;
-		vd->data_type = TEX_VD_RGBA_PREMUL;
-	}
-	else {
-		depth = 1;
-		vd->data_type = TEX_VD_INTENSITY;
-	}
-	
-	if (totres > 0) {
-		vd->dataset = (float *)MEM_mapallocN(sizeof(float) * depth * (totres), "hair volume texture data");
-		
-		for (i = 0; i < totres; ++i) {
-			switch (vd->hair_type) {
-				case TEX_VD_HAIRDENSITY:
-					vd->dataset[i] = grid->verts[i].density;
-					break;
-				
-				case TEX_VD_HAIRRESTDENSITY:
-					vd->dataset[i] = 0.0f; // TODO
-					break;
-				
-				case TEX_VD_HAIRVELOCITY: {
-					vd->dataset[i + 0*totres] = grid->verts[i].velocity[0];
-					vd->dataset[i + 1*totres] = grid->verts[i].velocity[1];
-					vd->dataset[i + 2*totres] = grid->verts[i].velocity[2];
-					vd->dataset[i + 3*totres] = len_v3(grid->verts[i].velocity);
-					break;
-				}
-				case TEX_VD_HAIRENERGY:
-					vd->dataset[i] = 0.0f; // TODO
-					break;
-			}
-		}
-	}
-	else {
-		vd->dataset = NULL;
-	}
-	
-	return true;
-}
diff --git a/source/blender/physics/intern/implicit.h b/source/blender/physics/intern/implicit.h
index 2f62ab98e12..d6bf5c6b7bf 100644
--- a/source/blender/physics/intern/implicit.h
+++ b/source/blender/physics/intern/implicit.h
@@ -171,8 +171,6 @@ void BPH_hair_volume_vertex_grid_forces(struct HairGrid *grid, const float x[3],
                                         float smoothfac, float pressurefac, float minpressure,
                                         float f[3], float dfdx[3][3], float dfdv[3][3]);
 
-bool BPH_hair_volume_get_texture_data(struct HairGrid *grid, struct VoxelData *vd);
-
 #ifdef __cplusplus
 }
 #endif