diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-05-25 17:33:59 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-05-25 17:33:59 +0400 |
commit | f7c4dd6d56be173cc1a63be9d72d212e3dca4c7c (patch) | |
tree | 99dd22eccecb91f939845e6f953d059b7c816183 /source/blender/blenkernel/intern/cloth.c | |
parent | 5416f51b7a0c4e1ca23592385fbd025355cedc0e (diff) |
Merge back a few cloth solver fixes from the render branch:
* Disable openmp for dot product, this gives different results each
time due to non-commutative floating point add.
* Disable openmp with few vertices, the extra thread overhead only
slows things down then.
* Replace the hack that would divide stepsPerFrame and then set it
back, now it simply uses the timescale in the collision function.
This was incorrect because stepsPerFrame is an int, but we don't
want this to be rounded.
* Extra out of bounds check for hair velocity smoothing grid.
Diffstat (limited to 'source/blender/blenkernel/intern/cloth.c')
-rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index 2b11c4bdfa0..ce5bca1da56 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -27,16 +27,13 @@ #include "MEM_guardedalloc.h" -#include "BKE_cloth.h" - #include "BKE_cdderivedmesh.h" +#include "BKE_cloth.h" #include "BKE_effect.h" #include "BKE_global.h" #include "BKE_modifier.h" -#include "BKE_utildefines.h" - #include "BKE_pointcache.h" - +#include "BKE_utildefines.h" #ifdef _WIN32 void tstart ( void ) |