Merge branch 'blender2.7'
[blender.git] / intern / cycles / render / image.h
index cd7130b..1403b90 100644 (file)
@@ -96,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);