Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / render / image.h
index b608bc30e70367da307f4b3af74084a2a4a11be0..d7fc31e3ab1d5d024f5fe43725c2635942f4e39d 100644 (file)
@@ -84,6 +84,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);