diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-12 19:13:06 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-12 19:13:06 +0400 |
| commit | bddc7dfc20919105e02181340d54b2faf52c95ac (patch) | |
| tree | 1000cce34ce4cd97c87862fcd576d32f0711a0fa /source/blender/blenlib/intern/voxel.c | |
| parent | 2f2b15bbb2a30ee312d65c627d54a12445f4b987 (diff) | |
style cleanup: remaining BLI files.
Diffstat (limited to 'source/blender/blenlib/intern/voxel.c')
| -rw-r--r-- | source/blender/blenlib/intern/voxel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/voxel.c b/source/blender/blenlib/intern/voxel.c index 3ad9edd14a3..10eb4e82912 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_VOXEL_INDEX(x, y, z, res) ]; + return data[BLI_VOXEL_INDEX(x, y, z, res)]; } /* *** nearest neighbor *** */ @@ -128,7 +128,7 @@ float BLI_voxel_sample_triquadratic(float *data, const int res[3], const float c + v[1] * ( u[0] * data[xc[0] + yc[1] + zc[2]] + u[1] * data[xc[1] + yc[1] + zc[2]] + u[2] * data[xc[2] + yc[1] + zc[2]] ) + v[2] * ( u[0] * data[xc[0] + yc[2] + zc[2]] + u[1] * data[xc[1] + yc[2] + zc[2]] + u[2] * data[xc[2] + yc[2] + zc[2]] ) ); -} + } return 0.f; } |