diff options
| author | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
| commit | 0829cebeb024095c268f190c34daa8ae9a5a224c (patch) | |
| tree | 12ee5a4a1c2a32e12eff47c8eb9bb0ed217791c1 /intern/cycles/render/image.h | |
| parent | cfde6ebf450594faa57c4bfeaecff10fe512c91b (diff) | |
| parent | 42be3964eb201180f6b0fa1ff6ce43b8c3845bc2 (diff) | |
Merge branch 'master' into asset-uuid--archivedasset-uuid--archived
Diffstat (limited to 'intern/cycles/render/image.h')
| -rw-r--r-- | intern/cycles/render/image.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 2000582ce70..fffe7c5152a 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -17,7 +17,6 @@ #ifndef __IMAGE_H__ #define __IMAGE_H__ -#include "device/device.h" #include "device/device_memory.h" #include "render/colorspace.h" @@ -31,6 +30,7 @@ CCL_NAMESPACE_BEGIN class Device; +class DeviceInfo; class ImageHandle; class ImageKey; class ImageMetaData; |