diff options
| author | Luca Rood <dev@lucarood.com> | 2020-01-12 19:08:01 +0300 |
|---|---|---|
| committer | Luca Rood <dev@lucarood.com> | 2020-01-12 19:23:02 +0300 |
| commit | 0ef881cc57829471c441367ada6bf88119eaf26a (patch) | |
| tree | fe17ce277a6a9beb77c341b6e0057a7e54029f70 /source/blender/blenkernel/BKE_collision.h | |
| parent | 1cb938ef2c927d062439f06416bbf0bf8446625b (diff) | |
Fix T71620: broken particle collisions due to rB0666ece2e2f9
An optimisation in the collision system for cloth (static collisions),
broke the particle collisions, as they take motion into account. This
restores the moving BVH required for the particle collisions, while
keeping the optimisation for the cloth collisions.
Reviewed By: mano-wii
Maniphest Tasks: T71620
Differential Revision: https://developer.blender.org/D6560
Diffstat (limited to 'source/blender/blenkernel/BKE_collision.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_collision.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h index 5d7a5094eb5..5bf697e5df9 100644 --- a/source/blender/blenkernel/BKE_collision.h +++ b/source/blender/blenkernel/BKE_collision.h @@ -125,7 +125,10 @@ void bvhtree_update_from_mvert(BVHTree *bvhtree, // move Collision modifier object inter-frame with step = [0,1] // defined in collisions.c -void collision_move_object(struct CollisionModifierData *collmd, float step, float prevstep); +void collision_move_object(struct CollisionModifierData *collmd, + const float step, + const float prevstep, + const bool moving_bvh); void collision_get_collider_velocity(float vel_old[3], float vel_new[3], |