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/image.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/image.h')
| -rw-r--r-- | intern/cycles/render/image.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index b28f4536db2..b4097d624b8 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -36,7 +36,7 @@ public: ~ImageManager(); enum ImageDataType { - IMAGE_DATA_TYPE_FLOAT = 0, + IMAGE_DATA_TYPE_FLOAT4 = 0, IMAGE_DATA_TYPE_BYTE = 1, IMAGE_DATA_NUM_TYPES |