diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-07 16:27:18 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-07 16:27:18 +0400 |
| commit | 9fba458a7fe535e60f5c6beee9757fe25ffe2d49 (patch) | |
| tree | e625eb73d3da32a01c84385e1976f81d2f8b92bd /source/blender/makesdna | |
| parent | bdf731f03d727d3862537c59fa11477b77eb60b0 (diff) | |
Cycles: float texture support. Due to GPU limitations there are now 95 byte,
and 5 float image textures. For CPU render this limit will be lifted later
on with image cache support. Patch by Mike Farnsworth.
Also changed color space option in image/environment texture node, to show
options Color and Non-Color Data, instead of sRGB and Linear, this is more
descriptive, and it was not really correct to equate Non-Color Data with
Linear.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index f0d0a556d92..0d309aad36c 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -582,8 +582,8 @@ typedef struct TexNodeOutput { #define SHD_WAVE_TRI 2 /* image/environment texture */ -#define SHD_COLORSPACE_LINEAR 0 -#define SHD_COLORSPACE_SRGB 1 +#define SHD_COLORSPACE_NONE 0 +#define SHD_COLORSPACE_COLOR 1 /* blur node */ #define CMP_NODE_BLUR_ASPECT_NONE 0 |