Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2014-11-06 14:28:13 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-01-20 11:30:06 +0300
commitdddf088375c78dd47675eeeb734a6380e50bd292 (patch)
tree0fa9eef27d12557c26be8de318424ec30eadf4b4 /source/blender/physics
parentd05c653ade0a5e80652bb36b4d53c5a013b2fc0f (diff)
Removed unused "collider grid" struct from hair volumetrics.
This is a leftover from previous approach of hair collisions (with insufficient results). The hair volumetrics actually implements "collision" with solid objects as well, but uses a Neumann boundary condition on the main grid for this purpose.
Diffstat (limited to 'source/blender/physics')
-rw-r--r--source/blender/physics/intern/hair_volume.c7
-rw-r--r--source/blender/physics/intern/implicit.h1
2 files changed, 0 insertions, 8 deletions
diff --git a/source/blender/physics/intern/hair_volume.c b/source/blender/physics/intern/hair_volume.c
index 9e9051a3a92..a1c6cb6602a 100644
--- a/source/blender/physics/intern/hair_volume.c
+++ b/source/blender/physics/intern/hair_volume.c
@@ -93,13 +93,6 @@ typedef struct HairVertexGrid {
struct SimDebugData *debug_data;
} HairVertexGrid;
-typedef struct HairColliderGrid {
- HairGridVert *verts;
- int res;
- float gmin[3], gmax[3];
- float scale[3];
-} HairColliderGrid;
-
#define HAIR_GRID_INDEX_AXIS(vec, res, gmin, scale, axis) ( min_ii( max_ii( (int)((vec[axis] - gmin[axis]) / scale[axis]), 0), res-2 ) )
BLI_INLINE int hair_grid_offset(const float vec[3], int res, const float gmin[3], const float scale[3])
diff --git a/source/blender/physics/intern/implicit.h b/source/blender/physics/intern/implicit.h
index c62d26b508f..26f5ba3618f 100644
--- a/source/blender/physics/intern/implicit.h
+++ b/source/blender/physics/intern/implicit.h
@@ -166,7 +166,6 @@ bool BPH_mass_spring_force_spring_goal(struct Implicit_Data *data, int i, const
/* ======== Hair Volumetric Forces ======== */
struct HairVertexGrid;
-struct HairColliderGrid;
struct Object;
struct VoxelData;