Merge branch 'blender2.7'
authorCampbell Barton <ideasman42@gmail.com>
Fri, 1 Feb 2019 22:37:50 +0000 (09:37 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 1 Feb 2019 22:37:50 +0000 (09:37 +1100)
intern/cycles/render/image.cpp
intern/cycles/render/image.h

index ea69911..1edd586 100644 (file)
@@ -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);
                }
index d7fc31e..1403b90 100644 (file)
@@ -44,6 +44,18 @@ public:
        /* Automatically set. */
        ImageDataType type;
        bool is_linear;
+
+       bool operator==(const ImageMetaData& other) const
+       {
+               return is_float == other.is_float &&
+                      is_half == other.is_half &&
+                      channels == other.channels &&
+                      width == other.width &&
+                      height == other.height &&
+                      depth == other.depth &&
+                      type == other.type &&
+                      is_linear == other.is_linear;
+       }
 };
 
 class ImageManager {