[Bf-blender-cvs] [439c7e0] hair_immediate_fixes: Removed unused "collider grid" struct from hair volumetrics.
Lukas Tönne
noreply at git.blender.org
Thu Nov 6 14:12:15 CET 2014
Commit: 439c7e089a6a38d3c8dd4e08859232da297c3633
Author: Lukas Tönne
Date: Thu Nov 6 12:28:13 2014 +0100
Branches: hair_immediate_fixes
https://developer.blender.org/rB439c7e089a6a38d3c8dd4e08859232da297c3633
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.
===================================================================
M source/blender/physics/intern/hair_volume.c
M source/blender/physics/intern/implicit.h
===================================================================
diff --git a/source/blender/physics/intern/hair_volume.c b/source/blender/physics/intern/hair_volume.c
index 9e9051a..a1c6cb6 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 c62d26b..26f5ba3 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;
More information about the Bf-blender-cvs
mailing list