[Bf-blender-cvs] [4846184095e] master: Cycles: Fix missing type declaration in OpenCL image

[Sergey Sharybin]

Commit: 4846184095e97a7477cca16457b0918dcd26fb5c
Author: Sergey Sharybin
Date:   Tue May 2 15:39:18 2017 +0200
Branches: master
https://developer.blender.org/rB4846184095e97a7477cca16457b0918dcd26fb5c

Cycles: Fix missing type declaration in OpenCL image

Spotted by Mai in IRC, thanks!

===================================================================

M	intern/cycles/kernel/kernel_image_opencl.h

===================================================================

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);