diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-02 01:37:50 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-02 01:37:50 +0300 |
| commit | a3bf8da8758fb4640feaa3eba5c21161c58b9659 (patch) | |
| tree | 96fef05db3006836f5a163716d1b0e6daff6e968 /intern/cycles/render/image.cpp | |
| parent | 9a63fa21eb45038ce747748156da61b14213d6c7 (diff) | |
| parent | 81159e99b819910b72cb3caba6b3cd4f35184ea9 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/render/image.cpp')
| -rw-r--r-- | intern/cycles/render/image.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index ea6991172d0..1edd5865836 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -333,6 +333,10 @@ int ImageManager::add_image(const string& filename, img->use_alpha = use_alpha; img->need_load = true; } + if(!(img->metadata == metadata)) { + img->metadata = metadata; + img->need_load = true; + } img->users++; return type_index_to_flattened_slot(slot, type); } |