diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-25 16:02:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-25 16:02:59 +0300 |
| commit | ced20b74e58f3dd33840f2a62f6f1f19714b35d7 (patch) | |
| tree | 5f97a618b28c9a88635d511178d63c59d8fcc186 /intern/cycles/render/image.h | |
| parent | e29a6f739de36f4d33cd37181a946345bd26503d (diff) | |
Fix T50032: Wrong render result when same image is used with and without alpha
Diffstat (limited to 'intern/cycles/render/image.h')
| -rw-r--r-- | intern/cycles/render/image.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 47bbd92347c..494c74f0cdd 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -61,11 +61,13 @@ public: void remove_image(const string& filename, void *builtin_data, InterpolationType interpolation, - ExtensionType extension); + ExtensionType extension, + bool use_alpha); void tag_reload_image(const string& filename, void *builtin_data, InterpolationType interpolation, - ExtensionType extension); + ExtensionType extension, + bool use_alpha); ImageDataType get_image_metadata(const string& filename, void *builtin_data, bool& is_linear); void device_update(Device *device, |