diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-10-31 22:29:51 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:30:05 +0300 |
| commit | d42525a9b5493b758d0f19423bafc43cd335955b (patch) | |
| tree | cd22c7166cbb9e71a9523dba9b1555163452a6c8 /source/blender/physics/BPH_mass_spring.h | |
| parent | cd717f145db9964cede0b46319c79c8dcef9bfd6 (diff) | |
Reimplemented the voxel texture type for displaying hair continuum grids.
Conflicts:
source/blender/physics/intern/BPH_mass_spring.cpp
Diffstat (limited to 'source/blender/physics/BPH_mass_spring.h')
| -rw-r--r-- | source/blender/physics/BPH_mass_spring.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/physics/BPH_mass_spring.h b/source/blender/physics/BPH_mass_spring.h index 166d0402d1c..c189dea28a4 100644 --- a/source/blender/physics/BPH_mass_spring.h +++ b/source/blender/physics/BPH_mass_spring.h @@ -33,7 +33,10 @@ extern "C" { #endif struct Implicit_Data; +struct Object; struct ClothModifierData; +struct ListBase; +struct VoxelData; typedef enum eMassSpringSolverStatus { BPH_SOLVER_SUCCESS = (1 << 0), @@ -50,7 +53,7 @@ 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 implicit_hair_volume_get_texture_data(struct Object *UNUSED(ob), struct ClothModifierData *clmd, struct ListBase *UNUSED(effectors), struct VoxelData *vd); +bool BPH_cloth_solver_get_texture_data(struct Object *ob, struct ClothModifierData *clmd, struct VoxelData *vd); #ifdef __cplusplus } |