diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:46:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:46:04 +0300 |
| commit | 8dff53898965b5ea07a99245071098207d3f197e (patch) | |
| tree | 6d15750b7009796ac7176bb3063145e2dc12b66b /intern/cycles/util/util_texture.h | |
| parent | 45fdf41be87fb0b2fbf85778a714537ed1f5eca3 (diff) | |
| parent | 0e2915b2929aa312a03bc4d3a606bb8073fcead0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/util/util_texture.h')
| -rw-r--r-- | intern/cycles/util/util_texture.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/util/util_texture.h b/intern/cycles/util/util_texture.h index 4b5f630427d..f752e81128d 100644 --- a/intern/cycles/util/util_texture.h +++ b/intern/cycles/util/util_texture.h @@ -53,6 +53,8 @@ typedef enum ImageDataType { IMAGE_DATA_TYPE_FLOAT = 3, IMAGE_DATA_TYPE_BYTE = 4, IMAGE_DATA_TYPE_HALF = 5, + IMAGE_DATA_TYPE_USHORT4 = 6, + IMAGE_DATA_TYPE_USHORT = 7, IMAGE_DATA_NUM_TYPES } ImageDataType; |