diff options
Diffstat (limited to 'source/blender/physics')
| -rw-r--r-- | source/blender/physics/BPH_mass_spring.h | 4 | ||||
| -rw-r--r-- | source/blender/physics/intern/BPH_mass_spring.cpp | 4 | ||||
| -rw-r--r-- | source/blender/physics/intern/eigen_utils.h | 2 | ||||
| -rw-r--r-- | source/blender/physics/intern/hair_volume.cpp | 2 | ||||
| -rw-r--r-- | source/blender/physics/intern/implicit.h | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/physics/BPH_mass_spring.h b/source/blender/physics/BPH_mass_spring.h index c189dea28a4..de5fdd2b81d 100644 --- a/source/blender/physics/BPH_mass_spring.h +++ b/source/blender/physics/BPH_mass_spring.h @@ -25,6 +25,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/physics/BPH_mass_spring.h + * \ingroup bph + */ + #ifndef __BPH_MASS_SPRING_H__ #define __BPH_MASS_SPRING_H__ diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp index e0ca945eaf7..ff211e7906a 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -140,7 +140,7 @@ static bool collision_response(ClothModifierData *clmd, CollisionModifierData *c float v1[3], v2_old[3], v2_new[3], v_rel_old[3], v_rel_new[3];
float epsilon2 = BLI_bvhtree_getepsilon(collmd->bvhtree);
- float margin_distance = collpair->distance - epsilon2;
+ float margin_distance = (float)collpair->distance - epsilon2;
float mag_v_rel;
zero_v3(r_impulse);
@@ -859,7 +859,7 @@ static void cloth_collision_solve_extra(Object *ob, ClothModifierData *clmd, Lis Implicit_Data *id = cloth->implicit;
ClothVertex *verts = cloth->verts;
int numverts = cloth->numverts;
- const float spf = (float)clmd->sim_parms->stepsPerFrame / clmd->sim_parms->timescale;;
+ const float spf = (float)clmd->sim_parms->stepsPerFrame / clmd->sim_parms->timescale;
bool do_extra_solve;
int i;
diff --git a/source/blender/physics/intern/eigen_utils.h b/source/blender/physics/intern/eigen_utils.h index cd3bd5ee45d..e4a4f306aeb 100644 --- a/source/blender/physics/intern/eigen_utils.h +++ b/source/blender/physics/intern/eigen_utils.h @@ -28,7 +28,7 @@ #ifndef __EIGEN_UTILS_H__ #define __EIGEN_UTILS_H__ -/** \file eigen_utils.h +/** \file blender/physics/intern/eigen_utils.h * \ingroup bph */ diff --git a/source/blender/physics/intern/hair_volume.cpp b/source/blender/physics/intern/hair_volume.cpp index b07af1d201c..d79cf7d8c31 100644 --- a/source/blender/physics/intern/hair_volume.cpp +++ b/source/blender/physics/intern/hair_volume.cpp @@ -594,7 +594,7 @@ BLI_INLINE float hair_volume_density_divergence(float density, float target_dens return 0.0f; } -bool BPH_hair_volume_solve_divergence(HairGrid *grid, float dt, float target_density, float target_strength) +bool BPH_hair_volume_solve_divergence(HairGrid *grid, float /*dt*/, float target_density, float target_strength) { const float flowfac = grid->cellsize; const float inv_flowfac = 1.0f / grid->cellsize; diff --git a/source/blender/physics/intern/implicit.h b/source/blender/physics/intern/implicit.h index d286d3df1a5..dba1cd11ae0 100644 --- a/source/blender/physics/intern/implicit.h +++ b/source/blender/physics/intern/implicit.h @@ -59,7 +59,6 @@ extern "C" { //#define IMPLICIT_ENABLE_EIGEN_DEBUG struct Implicit_Data; -struct ImplicitSolverInput; typedef struct ImplicitSolverResult { int status; @@ -133,7 +132,6 @@ bool BPH_mass_spring_force_spring_goal(struct Implicit_Data *data, int i, const struct HairGrid; -struct Object; struct VoxelData; #define MAX_HAIR_GRID_RES 256 |