diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-10-14 15:50:30 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-10-14 15:50:30 +0400 |
| commit | af7b777d2200eb7418d5004a8d6a33ab44f2383a (patch) | |
| tree | 0ccb363c51588f72da765d7a1e34fe7e06068f60 /source/blender/blenkernel/intern/collision.c | |
| parent | b0b37252da6ced3a213db5e603ba843d07619126 (diff) | |
Bugfix for regression from 2.46 on cloth collisions reported by Daniel Salazar via IRC
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index b8f5b467c11..e8cec7e1852 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -1313,16 +1313,16 @@ CollisionModifierData **get_collisionobjects(Object *self, int *numcollobj) coll_ob = base->object; + if(coll_ob == self) + continue; + if(coll_ob->pd && coll_ob->pd->deflect) { collmd = ( CollisionModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Collision ); } if ( collmd ) - { - if(coll_ob == self) - continue; - + { if(numobj >= maxobj) { // realloc @@ -1351,6 +1351,9 @@ CollisionModifierData **get_collisionobjects(Object *self, int *numcollobj) coll_ob = go->ob; collmd = NULL; + if(coll_ob == self) + continue; + if(coll_ob->pd && coll_ob->pd->deflect) { collmd = ( CollisionModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Collision ); @@ -1358,9 +1361,6 @@ CollisionModifierData **get_collisionobjects(Object *self, int *numcollobj) if ( !collmd ) continue; - - if(coll_ob == self) - continue; if( !collmd->bvhtree) continue; |