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 /intern/cycles/render/nodes.h | |
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 'intern/cycles/render/nodes.h')
-rw-r--r-- | intern/cycles/render/nodes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index 338af4ef48a..6c9ed422b88 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -64,6 +64,7 @@ public: ImageManager *image_manager; int slot; + bool is_float; string filename; ustring color_space; @@ -78,6 +79,7 @@ public: ImageManager *image_manager; int slot; + bool is_float; string filename; ustring color_space; |