diff options
| author | Carlo Andreacchio <carlorules@gmail.com> | 2014-05-07 18:36:44 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-05-07 18:43:50 +0400 |
| commit | 8b8d5a441f5815e83f83bacf8023e2cc3fbb2a04 (patch) | |
| tree | 777b695333e690b56f501f9fe037f650c0e50a69 /intern/cycles/render/image.h | |
| parent | 1d03a8b30932e6a4c4e511eef3f543590b0bcd2a (diff) | |
Cycles: add support for "Use Alpha" option on image datablocks.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D486
Diffstat (limited to 'intern/cycles/render/image.h')
| -rw-r--r-- | intern/cycles/render/image.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index a52ab2853b9..a862ffce5c3 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -49,7 +49,7 @@ public: ImageManager(); ~ImageManager(); - int add_image(const string& filename, void *builtin_data, bool animated, bool& is_float, bool& is_linear, InterpolationType interpolation); + int add_image(const string& filename, void *builtin_data, bool animated, bool& is_float, bool& is_linear, InterpolationType interpolation, bool use_alpha); void remove_image(int slot); void remove_image(const string& filename, void *builtin_data, InterpolationType interpolation); bool is_float_image(const string& filename, void *builtin_data, bool& is_linear); @@ -72,6 +72,7 @@ public: string filename; void *builtin_data; + bool use_alpha; bool need_load; bool animated; InterpolationType interpolation; |