diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-05 04:58:22 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-05 04:58:22 +0400 |
commit | 084fedd03a006982b386873a70f649627bf200aa (patch) | |
tree | c1934f9da2b2f9f7987104c7426d1ba2b11f0bb2 /source/blender/blenlib | |
parent | 4c5502bfd690cad5c02aa6a0be0bd59400ef3407 (diff) |
code cleanup: brush/camera naming
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_voxel.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/voxel.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_voxel.h b/source/blender/blenlib/BLI_voxel.h index 4e9e6f111db..7b92ac05d29 100644 --- a/source/blender/blenlib/BLI_voxel.h +++ b/source/blender/blenlib/BLI_voxel.h @@ -33,7 +33,7 @@ */ /** find the index number of a voxel, given x/y/z integer coords and resolution vector */ -#define BLI_VEXEL_INDEX(x, y, z, res) ((z) * (res)[1] * (res)[0] + (y) * (res)[0] + (x)) +#define BLI_VOXEL_INDEX(x, y, z, res) ((z) * (res)[1] * (res)[0] + (y) * (res)[0] + (x)) /* all input coordinates must be in bounding box 0.0 - 1.0 */ float BLI_voxel_sample_nearest(float *data, const int res[3], const float co[3]); diff --git a/source/blender/blenlib/intern/voxel.c b/source/blender/blenlib/intern/voxel.c index 1fe42384eb6..3ad9edd14a3 100644 --- a/source/blender/blenlib/intern/voxel.c +++ b/source/blender/blenlib/intern/voxel.c @@ -40,7 +40,7 @@ BLI_INLINE float D(float *data, const int res[3], int x, int y, int z) CLAMP(x, 0, res[0] - 1); CLAMP(y, 0, res[1] - 1); CLAMP(z, 0, res[2] - 1); - return data[ BLI_VEXEL_INDEX(x, y, z, res) ]; + return data[ BLI_VOXEL_INDEX(x, y, z, res) ]; } /* *** nearest neighbor *** */ |