diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 04:35:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 04:35:26 +0400 |
| commit | 743d2f8c0f4359eef120eab4db7bfe00b5185e05 (patch) | |
| tree | 2ea0e95f16a5a4cdb285ef40202995842ad6f920 /source/blender/blenloader | |
| parent | 7d124edeadeb60b41e7c828c6b9c18c0850aa933 (diff) | |
rename image type defines to be less ambiguous, also set BMP as not supporting alpha (it reads but cant write)
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index dcde4ac421b..a6aecac1c34 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -7364,10 +7364,10 @@ void do_versions_image_settings_2_60(Scene *sce) imf->depth= R_IMF_CHAN_DEPTH_8; /* openexr */ - imf->exr_codec = rd->quality & 7; /* strange but true! 0-4 are valid values */ + imf->exr_codec = rd->quality & 7; /* strange but true! 0-4 are valid values, OPENEXR_COMPRESS */ switch (imf->imtype) { - case R_OPENEXR: + case R_IMF_IMTYPE_OPENEXR: imf->depth= (rd->subimtype & R_OPENEXR_HALF) ? R_IMF_CHAN_DEPTH_16 : R_IMF_CHAN_DEPTH_32; if (rd->subimtype & R_PREVIEW_JPG) { imf->flag |= R_IMF_FLAG_PREVIEW_JPG; @@ -7376,12 +7376,12 @@ void do_versions_image_settings_2_60(Scene *sce) imf->flag |= R_IMF_FLAG_ZBUF; } break; - case R_TIFF: + case R_IMF_IMTYPE_TIFF: if (rd->subimtype & R_TIFF_16BIT) { imf->depth= R_IMF_CHAN_DEPTH_16; } break; - case R_JP2: + case R_IMF_IMTYPE_JP2: if (rd->subimtype & R_JPEG2K_16BIT) { imf->depth= R_IMF_CHAN_DEPTH_16; } @@ -7399,8 +7399,8 @@ void do_versions_image_settings_2_60(Scene *sce) imf->jp2_flag |= R_IMF_JP2_FLAG_CINE_48; } break; - case R_CINEON: - case R_DPX: + case R_IMF_IMTYPE_CINEON: + case R_IMF_IMTYPE_DPX: if (rd->subimtype & R_CINEON_LOG) { imf->cineon_flag |= R_IMF_CINEON_FLAG_LOG; } |