diff options
| author | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
| commit | 889c4ca9c26d770af02cedef972d65eb173bdb5e (patch) | |
| tree | 6f46156146db1b3f09d92c6eaa1f44ba8a584ed4 /intern/cycles/render/image.h | |
| parent | 87df15190210eb84ef52e5dccc2932918f912da5 (diff) | |
| parent | 0829cebeb024095c268f190c34daa8ae9a5a224c (diff) | |
Merge branch 'asset-uuid--archived' into asset-engine--archivedasset-engine--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; |