Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-07-22 02:58:08 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-07-22 02:58:08 +0400
commit9b515033071b40e982ef647ee225e8afc377e0c9 (patch)
treeb8906cf9d21d2441c6dd0db1b518561def3f8f1a /source/blender/blenkernel/intern/collision.c
parent049dd8a0ffa94b0d02033877ec99172659b89d8c (diff)
style cleanup
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
-rw-r--r--source/blender/blenkernel/intern/collision.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index 516de35fab3..af9bb971d05 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -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];