diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-27 00:49:30 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-27 00:49:30 +0300 |
commit | f228a08d027ef700344d35f1ba958249afa93222 (patch) | |
tree | fc6c60d89f911bcb0c5019e2e6e4243e49cba9af /source/blender/blenkernel/intern | |
parent | e94276d4033c72000942a49100e552e800d09e58 (diff) | |
parent | 7dd0e36dc4582e57a3f5235f384b5207882c923e (diff) |
merge from master
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/particle_distribute.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/tracking_region_tracker.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c index 767a17a34e7..f411a605c7f 100644 --- a/source/blender/blenkernel/intern/particle_distribute.c +++ b/source/blender/blenkernel/intern/particle_distribute.c @@ -1101,7 +1101,7 @@ static int psys_thread_context_init_distribute(ParticleThreadContext *ctx, Parti /* This is to address tricky issues with vertex-emitting when user tries (and expects) exact 1-1 vert/part * distribution (see T47983 and its two example files). It allows us to consider pos as * 'midpoint between v and v+1' (or 'p and p+1', depending whether we have more vertices than particles or not), - * and avoid stumbling over float imprecisions in element_sum. + * and avoid stumbling over float impression in element_sum. * Note: moved face and volume distribution to this as well (instead of starting at zero), * for the same reasons, see T52682. */ pos = (totpart < totmapped) ? 0.5 / (double)totmapped : step * 0.5; /* We choose the smaller step. */ diff --git a/source/blender/blenkernel/intern/tracking_region_tracker.c b/source/blender/blenkernel/intern/tracking_region_tracker.c index dd7def16ca8..106dd125575 100644 --- a/source/blender/blenkernel/intern/tracking_region_tracker.c +++ b/source/blender/blenkernel/intern/tracking_region_tracker.c @@ -189,7 +189,7 @@ void tracking_configure_tracker(const MovieTrackingTrack *track, float *mask, options->image1_mask = NULL; } -/* Peform tracking from a reference_marker to destination_ibuf. +/* Perform tracking from a reference_marker to destination_ibuf. * Uses marker as an initial position guess. * * Returns truth if tracker returned success, puts result |