Merge branch 'blender2.7'

2 files changed, 16 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);
 		}
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index d7fc31e3ab1..1403b9050fd 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -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 {