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-08 02:51:57 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-07-08 02:51:57 +0400
commitcfb7aee017d95137e19b7b006d9393b5d6a935d4 (patch)
tree005a1981af6c5a0f36959d73479cc69137842eb4 /source/blender/modifiers/intern/MOD_collision.c
parentd58ce290e1e4dcb8d0b96259fdf29c854bfaef49 (diff)
style cleanup
Diffstat (limited to 'source/blender/modifiers/intern/MOD_collision.c')
-rw-r--r--source/blender/modifiers/intern/MOD_collision.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c
index 609d70b6e98..45296e322b5 100644
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@@ -140,15 +140,15 @@ static void deformVerts(ModifierData *md, Object *ob,
if ((current_time > collmd->time_xnew) || (BKE_ptcache_get_continue_physics())) {
unsigned int i;
- // check if mesh has changed
+ /* check if mesh has changed */
if (collmd->x && (numverts != collmd->numverts))
freeData((ModifierData *)collmd);
-
+
if (collmd->time_xnew == -1000) { /* first time */
- collmd->x = dm->dupVertArray(dm); // frame start position
-
+ collmd->x = dm->dupVertArray(dm); /* frame start position */
+
for (i = 0; i < numverts; i++) {
- // we save global positions
+ /* we save global positions */
mul_m4_v3(ob->obmat, collmd->x[i].co);
}
@@ -164,22 +164,22 @@ static void deformVerts(ModifierData *md, Object *ob,
collmd->mfaces = dm->dupTessFaceArray(dm);
collmd->numfaces = dm->getNumTessFaces(dm);
- // create bounding box hierarchy
+ /* create bounding box hierarchy */
collmd->bvhtree = bvhtree_build_from_mvert(collmd->mfaces, collmd->numfaces, collmd->x, numverts, ob->pd->pdef_sboft);
-
+
collmd->time_x = collmd->time_xnew = current_time;
}
else if (numverts == collmd->numverts) {
- // put positions to old positions
+ /* put positions to old positions */
tempVert = collmd->x;
collmd->x = collmd->xnew;
collmd->xnew = tempVert;
collmd->time_x = collmd->time_xnew;
-
+
memcpy(collmd->xnew, dm->getVertArray(dm), numverts * sizeof(MVert));
-
+
for (i = 0; i < numverts; i++) {
- // we save global positions
+ /* we save global positions */
mul_m4_v3(ob->obmat, collmd->xnew[i].co);
}
@@ -200,7 +200,7 @@ static void deformVerts(ModifierData *md, Object *ob,
collmd->bvhtree = bvhtree_build_from_mvert(collmd->mfaces, collmd->numfaces, collmd->current_x, numverts, ob->pd->pdef_sboft);
}
else {
- // recalc static bounding boxes
+ /* recalc static bounding boxes */
bvhtree_update_from_mvert(collmd->bvhtree, collmd->mfaces, collmd->numfaces, collmd->current_x, collmd->current_xnew, collmd->numverts, 1);
}