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/smoke.c | |
parent | fe52a05e950e474036c80f554a4675f12203695b (diff) | |
parent | 0cff044d84646c2890f13b8915eb708861bb36d6 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index a733842842c..2c378c17fa4 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -1527,7 +1527,7 @@ static void sample_mesh( interp_v3_v3v3v3(hit_normal, n1, n2, n3, weights); normalize_v3(hit_normal); /* apply normal directional and random velocity - * - TODO: random disabled for now since it doesnt really work well as pressure calc smoothens it out... */ + * - TODO: random disabled for now since it doesn't really work well as pressure calc smoothens it out... */ velocity_map[index * 3] += hit_normal[0] * sfs->vel_normal * 0.25f; velocity_map[index * 3 + 1] += hit_normal[1] * sfs->vel_normal * 0.25f; velocity_map[index * 3 + 2] += hit_normal[2] * sfs->vel_normal * 0.25f; @@ -2160,7 +2160,7 @@ static void update_flowsfluids( VECSUB(new_shift, total_shift, sds->shift); copy_v3_v3_int(sds->shift, total_shift); - /* calculate new domain boundary points so that smoke doesnt slide on sub-cell movement */ + /* calculate new domain boundary points so that smoke doesn't slide on sub-cell movement */ sds->p0[0] = sds->dp0[0] - sds->cell_size[0] * (sds->shift_f[0] - total_shift[0] - 0.5f); sds->p0[1] = sds->dp0[1] - sds->cell_size[1] * (sds->shift_f[1] - total_shift[1] - 0.5f); sds->p0[2] = sds->dp0[2] - sds->cell_size[2] * (sds->shift_f[2] - total_shift[2] - 0.5f); |