diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:41:46 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:42:52 +0300 |
commit | 253dce07d7cccb769d34356fc34c5900f7cd0ec8 (patch) | |
tree | e4018aaa2b89340d7d2e08cdbcba8ea3ff40b0cc /source/blender/blenkernel/intern/boids.c | |
parent | fe52a05e950e474036c80f554a4675f12203695b (diff) | |
parent | 0cff044d84646c2890f13b8915eb708861bb36d6 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/boids.c')
-rw-r--r-- | source/blender/blenkernel/intern/boids.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c index 1e4a99beec4..e88dcc71b2e 100644 --- a/source/blender/blenkernel/intern/boids.c +++ b/source/blender/blenkernel/intern/boids.c @@ -1284,7 +1284,7 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa) /* integrate new location & velocity */ /* by regarding the acceleration as a force at this stage we*/ - /* can get better control allthough it's a bit unphysical */ + /* can get better control although it's a bit unphysical */ mul_v3_fl(acc, 1.0f/pa_mass); copy_v3_v3(dvec, acc); |