diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-03 05:43:44 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-03 05:43:44 +0400 |
| commit | 9e93fc1e8acacb99b4b7638590ca4f1491e8b587 (patch) | |
| tree | e42fb8ecc337a617a98e01f6c882b890ab9387e6 /source/blender/blenlib/intern/voxel.c | |
| parent | 00782aae1f5f3159c7afb1cb227bd8de1bc4b9c4 (diff) | |
| parent | 95bba22af075148f9cbdb5a9b1ef41aeff1f560f (diff) | |
Merged changes in the trunk up to revision 44612.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h
Diffstat (limited to 'source/blender/blenlib/intern/voxel.c')
| -rw-r--r-- | source/blender/blenlib/intern/voxel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/voxel.c b/source/blender/blenlib/intern/voxel.c index f6c8c634c8d..dd56988fd90 100644 --- a/source/blender/blenlib/intern/voxel.c +++ b/source/blender/blenlib/intern/voxel.c @@ -43,7 +43,7 @@ BM_INLINE float D(float *data, const int res[3], int x, int y, int z) return data[ V_I(x, y, z, res) ]; } -/* *** nearest neighbour *** */ +/* *** nearest neighbor *** */ /* input coordinates must be in bounding box 0.0 - 1.0 */ float voxel_sample_nearest(float *data, const int res[3], const float co[3]) { |