Merge branch 'blender2.7'
[blender.git] / intern / cycles / render / image.h
index b608bc3..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 {
@@ -84,6 +96,10 @@ public:
                                int flat_slot,
                                Progress *progress);
        void device_free(Device *device);
+
+       void device_load_builtin(Device *device,
+                                Scene *scene,
+                                Progress& progress);
        void device_free_builtin(Device *device);
 
        void set_osl_texture_system(void *texture_system);