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:
authorBastien Montagne <montagne29@wanadoo.fr>2012-07-03 21:20:21 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2012-07-03 21:20:21 +0400
commit37dc4006c7876701842244d52ed33b35649370dd (patch)
treedc9fe6093ab8dbf1633f012b734427e48f6c7249 /source/blender/blenkernel/intern/particle_system.c
parentbc78942be0a2560e2072d2dea018e6ebc07e99d1 (diff)
First load of spell and typo fixes (mostly UI messages, but also one or two pieces of code using mis-spelled names).
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
-rw-r--r--source/blender/blenkernel/intern/particle_system.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 569e69f2d51..9fbf25b0db3 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -3320,10 +3320,10 @@ static int collision_response(ParticleData *pa, ParticleCollision *col, BVHTreeR
}
}
- /* stickness was possibly added before, so cancel that before calculating new normal velocity */
+ /* stickiness was possibly added before, so cancel that before calculating new normal velocity */
/* otherwise particles go flying out of the surface because of high reversed sticky velocity */
if (v0_dot < 0.0f) {
- v0_dot += pd->pdef_stickness;
+ v0_dot += pd->pdef_stickiness;
if (v0_dot > 0.0f)
v0_dot = 0.0f;
}
@@ -3379,8 +3379,8 @@ static int collision_response(ParticleData *pa, ParticleCollision *col, BVHTreeR
madd_v3_v3fl(pa->state.vel, nor, -dot);
}
- /* add stickness to surface */
- madd_v3_v3fl(pa->state.vel, pce->nor, -pd->pdef_stickness);
+ /* add stickiness to surface */
+ madd_v3_v3fl(pa->state.vel, pce->nor, -pd->pdef_stickiness);
/* set coordinates for next iteration */
copy_v3_v3(col->co1, co);