diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-05-06 14:42:50 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-05-06 15:37:35 +0300 |
| commit | 3807bcb3a845475ac938a331329d3fd92d90c3e4 (patch) | |
| tree | 98fc2b7357cd7ac02c9e16317f4bc8ec8a4f9100 /intern/cycles/render/scene.h | |
| parent | 36d8a70b00c2c0a1bc28ffad4cc2e283a77d7bab (diff) | |
Cleanup: Rename texture slots to float4 and byte, to distinguish from future float (single channel) and half_float slots.
Should be no functional changes, tested CPU and CUDA.
Diffstat (limited to 'intern/cycles/render/scene.h')
| -rw-r--r-- | intern/cycles/render/scene.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index b29aff88c01..4f139e4d73f 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -109,8 +109,8 @@ public: device_vector<uint> sobol_directions; /* cpu images */ - device_vector<uchar4> tex_image[TEX_NUM_BYTE_IMAGES_CPU]; - device_vector<float4> tex_float_image[TEX_NUM_FLOAT_IMAGES_CPU]; + device_vector<uchar4> tex_byte_image[TEX_NUM_BYTE_IMAGES_CPU]; + device_vector<float4> tex_float4_image[TEX_NUM_FLOAT4_IMAGES_CPU]; /* opencl images */ device_vector<uchar4> tex_image_packed; |