Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-05-02 16:39:18 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-05-02 16:39:33 +0300
commit4846184095e97a7477cca16457b0918dcd26fb5c (patch)
tree245ced412fba29fe479faa8294ae46787e42ecbf
parent143d7ad40f384f2df450730253c9b784dfe57333 (diff)
Cycles: Fix missing type declaration in OpenCL image
Spotted by Mai in IRC, thanks!
-rw-r--r--intern/cycles/kernel/kernel_image_opencl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_image_opencl.h b/intern/cycles/kernel/kernel_image_opencl.h
index 795f2e3149f..90747e09357 100644
--- a/intern/cycles/kernel/kernel_image_opencl.h
+++ b/intern/cycles/kernel/kernel_image_opencl.h
@@ -20,7 +20,7 @@
ccl_device_inline float4 svm_image_texture_read(KernelGlobals *kg, int id, int offset)
{
- const texture_type = kernel_tex_type(id);
+ const int texture_type = kernel_tex_type(id);
/* Float4 */
if(texture_type == IMAGE_DATA_TYPE_FLOAT4) {
return kernel_tex_fetch(__tex_image_float4_packed, offset);