From 2ee063868dca9abb7f76be101539fde70a830b72 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Fri, 27 May 2016 22:58:33 +0200 Subject: Cleanup: Shorten texture variables, tex and image was kinda redundant. Also make prefix consistent, so it starts with either TEX_NUM or TEX_START, followed by texture type and architecture. --- intern/cycles/render/scene.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'intern/cycles/render/scene.h') diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index 33c03d40f27..b34d6127118 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -109,10 +109,10 @@ public: device_vector sobol_directions; /* cpu images */ - device_vector tex_byte4_image[TEX_NUM_BYTE4_IMAGES_CPU]; - device_vector tex_float4_image[TEX_NUM_FLOAT4_IMAGES_CPU]; - device_vector tex_float_image[TEX_NUM_FLOAT_IMAGES_CPU]; - device_vector tex_byte_image[TEX_NUM_BYTE_IMAGES_CPU]; + device_vector tex_byte4_image[TEX_NUM_BYTE4_CPU]; + device_vector tex_float4_image[TEX_NUM_FLOAT4_CPU]; + device_vector tex_float_image[TEX_NUM_FLOAT_CPU]; + device_vector tex_byte_image[TEX_NUM_BYTE_CPU]; /* opencl images */ device_vector tex_image_byte4_packed; -- cgit v1.2.3