diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-03-08 03:23:45 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-03-08 03:23:45 +0400 |
| commit | 36279afbd356364b4b6e059d675ba0515b6b7a44 (patch) | |
| tree | ec725808f5e60c4f79a0a2816dc81efa11eb9931 /intern/cycles/render/image.cpp | |
| parent | dd2dca2f7e77e7521d13b78e875ffa58a90846f2 (diff) | |
Cycles: Compile fix and some cleanup for the Image interpolation commit.
Diffstat (limited to 'intern/cycles/render/image.cpp')
| -rw-r--r-- | intern/cycles/render/image.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index b2559c8c824..ecccaf54ba9 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -661,7 +661,7 @@ void ImageManager::device_pack_images(Device *device, DeviceScene *dscene, Progr /* The image options are packed bit 0 -> periodic bit 1 + 2 -> interpolation type */ - u_int8_t interpolation = (images[slot]->interpolation << 1) + 1; + uint8_t interpolation = (images[slot]->interpolation << 1) + 1; info[slot] = make_uint4(tex_img.data_width, tex_img.data_height, offset, interpolation); memcpy(pixels+offset, (void*)tex_img.data_pointer, tex_img.memory_size()); |