1 files changed, 7 insertions, 7 deletions

diff --git a/intern/cycles/kernel/kernels/cpu/kernel.cpp b/intern/cycles/kernel/kernels/cpu/kernel.cpp
index 365ce891354..d8a83f69685 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel.cpp
+++ b/intern/cycles/kernel/kernels/cpu/kernel.cpp
@@ -95,7 +95,7 @@ void kernel_tex_copy(KernelGlobals *kg,
 		int id = atoi(name + strlen("__tex_image_float4_"));
 		int array_index = id;
 
-		if(array_index >= 0 && array_index < TEX_NUM_FLOAT4_IMAGES_CPU) {
+		if(array_index >= 0 && array_index < TEX_NUM_FLOAT4_CPU) {
 			tex = &kg->texture_float4_images[array_index];
 		}
 
@@ -109,9 +109,9 @@ void kernel_tex_copy(KernelGlobals *kg,
 	else if(strstr(name, "__tex_image_float")) {
 		texture_image_float *tex = NULL;
 		int id = atoi(name + strlen("__tex_image_float_"));
-		int array_index = id - TEX_IMAGE_FLOAT_START_CPU;
+		int array_index = id - TEX_START_FLOAT_CPU;
 
-		if(array_index >= 0 && array_index < TEX_NUM_FLOAT_IMAGES_CPU) {
+		if(array_index >= 0 && array_index < TEX_NUM_FLOAT_CPU) {
 			tex = &kg->texture_float_images[array_index];
 		}
 
@@ -125,9 +125,9 @@ void kernel_tex_copy(KernelGlobals *kg,
 	else if(strstr(name, "__tex_image_byte4")) {
 		texture_image_uchar4 *tex = NULL;
 		int id = atoi(name + strlen("__tex_image_byte4_"));
-		int array_index = id - TEX_IMAGE_BYTE4_START_CPU;
+		int array_index = id - TEX_START_BYTE4_CPU;
 
-		if(array_index >= 0 && array_index < TEX_NUM_BYTE4_IMAGES_CPU) {
+		if(array_index >= 0 && array_index < TEX_NUM_BYTE4_CPU) {
 			tex = &kg->texture_byte4_images[array_index];
 		}
 
@@ -141,9 +141,9 @@ void kernel_tex_copy(KernelGlobals *kg,
 	else if(strstr(name, "__tex_image_byte")) {
 		texture_image_uchar *tex = NULL;
 		int id = atoi(name + strlen("__tex_image_byte_"));
-		int array_index = id - TEX_IMAGE_BYTE_START_CPU;
+		int array_index = id - TEX_START_BYTE_CPU;
 
-		if(array_index >= 0 && array_index < TEX_NUM_BYTE_IMAGES_CPU) {
+		if(array_index >= 0 && array_index < TEX_NUM_BYTE_CPU) {
 			tex = &kg->texture_byte_images[array_index];
 		}