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-05-04 01:35:04 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-04 01:35:04 +0400
commit5da2135eef39ac042a8c4babcac7be375e6903d2 (patch)
tree520282b4cae162503de17481cfbfbe43a93ed073 /source/blender/modifiers/intern/MOD_collision.c
parentb075765edd9e8f18b088faf1a55358d0f8a289cd (diff)
code cleanup: double promotion & some style cleanup
Diffstat (limited to 'source/blender/modifiers/intern/MOD_collision.c')
-rw-r--r--source/blender/modifiers/intern/MOD_collision.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c
index 83a366815de..9636104cb06 100644
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@@ -117,7 +117,7 @@ static void deformVerts(ModifierData *md, Object *ob,
/* if possible use/create DerivedMesh */
if (derivedData) dm = CDDM_copy(derivedData);
- else if (ob->type==OB_MESH) dm = CDDM_from_mesh(ob->data, ob);
+ else if (ob->type == OB_MESH) dm = CDDM_from_mesh(ob->data, ob);
if (!ob->pd) {
printf("CollisionModifier deformVerts: Should not happen!\n");
@@ -138,7 +138,7 @@ static void deformVerts(ModifierData *md, Object *ob,
numverts = dm->getNumVerts (dm);
- if ((current_time > collmd->time_xnew)|| (BKE_ptcache_get_continue_physics())) {
+ if ((current_time > collmd->time_xnew) || (BKE_ptcache_get_continue_physics())) {
unsigned int i;
// check if mesh has changed
@@ -148,7 +148,7 @@ static void deformVerts(ModifierData *md, Object *ob,
if (collmd->time_xnew == -1000) { /* first time */
collmd->x = dm->dupVertArray(dm); // frame start position
- for ( i = 0; i < numverts; i++ ) {
+ for (i = 0; i < numverts; i++) {
// we save global positions
mul_m4_v3(ob->obmat, collmd->x[i].co);
}