diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-02-24 21:06:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-02-24 21:06:51 +0300 |
| commit | aebe86bef1e13e3ce0a4d7a67b7cf5f6d9c1cd66 (patch) | |
| tree | 02dfb80bbcd6c0a89c21dd8710e81cd91a493198 /source/blender/blenkernel/intern/implicit.c | |
| parent | b888a32eee8147b028464336ad2404d8155c64dd (diff) | |
hair was running collision functions (copy to/from collision arrays), even when collision could not be done.
Diffstat (limited to 'source/blender/blenkernel/intern/implicit.c')
| -rw-r--r-- | source/blender/blenkernel/intern/implicit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c index ed3e7348d7e..a60fbae0f2d 100644 --- a/source/blender/blenkernel/intern/implicit.c +++ b/source/blender/blenkernel/intern/implicit.c @@ -1689,8 +1689,8 @@ int implicit_solver (Object *ob, float frame, ClothModifierData *clmd, ListBase VECCOPY(verts[i].txold, id->X[i]); } - - if(clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_ENABLED) + + if(clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_ENABLED && clmd->clothObject->bvhtree) { float temp = clmd->sim_parms->stepsPerFrame; /* not too nice hack, but collisions need this correction -jahka */ |