archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton
2012-07-21 22:58:08 +00:00
parent 049dd8a0ff
commit 9b51503307
42 changed files with 304 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/collision.c
View File

@@ -414,8 +414,9 @@ static CollPair* cloth_collision(ModifierData *md1, ModifierData *md2,
collpair->bp2 = face2->v2;
collpair->bp3 = face2->v3;
}
else
else {
i++;
}
}
if ( i == 2 ) {
if ( face2->v4 ) {
@@ -429,8 +430,9 @@ static CollPair* cloth_collision(ModifierData *md1, ModifierData *md2,
collpair->bp2 = face2->v4;
collpair->bp3 = face2->v3;
}
else
else {
break;
}
}
else if ( i == 3 ) {
if ( face1->v4 && face2->v4 ) {
@@ -444,8 +446,9 @@ static CollPair* cloth_collision(ModifierData *md1, ModifierData *md2,
collpair->bp2 = face2->v3;
collpair->bp3 = face2->v4;
}
else
else {
break;
}
}
#ifdef USE_BULLET
@@ -464,8 +467,7 @@ static CollPair* cloth_collision(ModifierData *md1, ModifierData *md2,
collpair->flag = 0;
collpair++;
}/*
else
{
else {
float w1, w2, w3, u1, u2, u3;
float v1[3], v2[3], relativeVelocity[3];