diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 00:47:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 00:47:19 +0400 |
| commit | 30fd1ab523393216a66a7debb7e42ec39e40a242 (patch) | |
| tree | a3ce9ca35b4f177f0dd31e62691a4613b242aaae /source/blender/makesdna/DNA_scene_types.h | |
| parent | 02a164baaa57ab037419fde864e02d6a432e858d (diff) | |
replace ImBuf.depth with ImBuf.planes to match ImageFormatData.planes & to avoid confusion with ImageFormatData.depth
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index ce9903e91ee..9df8fc5c5d8 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -218,7 +218,7 @@ typedef struct ImageFormatData { char depth; /* bits per channel, R_IMF_CHAN_DEPTH_8 -> 32, * not a flag, only set 1 at a time */ - char planes ; /* - R_PLANESBW, R_PLANES24, R_PLANES32 */ + char planes ; /* - R_IMF_PLANES_BW, R_IMF_PLANES_RGB, R_IMF_PLANES_RGBA */ char flag; /* generic options for all image types, alpha zbuffer */ char quality; /* (0 - 100), eg: jpeg quality */ @@ -262,6 +262,10 @@ typedef struct ImageFormatData { #define R_IMF_CHAN_DEPTH_24 (1<<4) /* 24bits (unused) */ #define R_IMF_CHAN_DEPTH_32 (1<<5) /* 32bits (full float exr) */ +/* ImageFormatData.planes */ +#define R_IMF_PLANES_RGB 24 +#define R_IMF_PLANES_RGBA 32 +#define R_IMF_PLANES_BW 8 typedef struct RenderData { struct ImageFormatData im_format; @@ -1044,11 +1048,6 @@ typedef struct Scene { #define R_ALPHAPREMUL 1 #define R_ALPHAKEY 2 -/* planes */ -#define R_PLANES24 24 -#define R_PLANES32 32 -#define R_PLANESBW 8 - /* color_mgt_flag */ #define R_COLOR_MANAGEMENT 1 |