diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-22 22:54:57 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-22 22:54:57 +0400 |
| commit | 83a44e48e7cb5cc6c794b50bb168a21144baeb06 (patch) | |
| tree | 549504aa10e5c25cb06bdebeb16316f191d31c9e /source/blender/imbuf | |
| parent | 586c631c88d7a4ea24810bf18ab96ed7ec542d37 (diff) | |
Cycles: some code changes to sync with trunk.
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/IMB_imbuf_types.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h index c4872f370e5..f5e2bf71468 100644 --- a/source/blender/imbuf/IMB_imbuf_types.h +++ b/source/blender/imbuf/IMB_imbuf_types.h @@ -169,27 +169,39 @@ typedef struct ImBuf { #define JPG (1 << 27) #define BMP (1 << 26) +#ifdef WITH_QUICKTIME #define QUICKTIME (1 << 25) +#endif +#ifdef WITH_HDR #define RADHDR (1 << 24) +#endif +#ifdef WITH_TIFF #define TIF (1 << 23) #define TIF_16BIT (1 << 8 ) +#endif #define OPENEXR (1 << 22) #define OPENEXR_HALF (1 << 8 ) #define OPENEXR_COMPRESS (7) +#ifdef WITH_CINEON #define CINEON (1 << 21) #define DPX (1 << 20) +#endif +#ifdef WITH_DDS #define DDS (1 << 19) +#endif +#ifdef WITH_OPENJPEG #define JP2 (1 << 18) #define JP2_12BIT (1 << 17) #define JP2_16BIT (1 << 16) #define JP2_YCC (1 << 15) #define JP2_CINE (1 << 14) #define JP2_CINE_48FPS (1 << 13) +#endif #define RAWTGA (TGA | 1) |