diff options
| author | IRIE Shinsuke <irieshinsuke@yahoo.co.jp> | 2014-03-31 09:20:55 +0400 |
|---|---|---|
| committer | IRIE Shinsuke <irieshinsuke@yahoo.co.jp> | 2014-03-31 12:37:55 +0400 |
| commit | 6316306cc07c77d4cf6fff52bc8a35ba102b8f56 (patch) | |
| tree | 39e114bac8220770be52ca1078a0d4318ad82b92 /source/blender/makesrna | |
| parent | 2fc7d04804fc9411647466d6765e2716e56a9cc8 (diff) | |
Fix bug in image texture UI: "Use Alpha" checkbox doesn't appear if file format is BMP.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 90d14a7ba6f..0c70e332053 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -729,7 +729,7 @@ static void rna_ImageFormatSettings_file_format_set(PointerRNA *ptr, int value) ID *id = ptr->id.data; const char is_render = (id && GS(id->name) == ID_SCE); /* see note below on why this is */ - const char chan_flag = BKE_imtype_valid_channels(imf->imtype) | (is_render ? IMA_CHAN_FLAG_BW : 0); + const char chan_flag = BKE_imtype_valid_channels(imf->imtype, true) | (is_render ? IMA_CHAN_FLAG_BW : 0); imf->imtype = value; @@ -800,7 +800,7 @@ static EnumPropertyItem *rna_ImageFormatSettings_color_mode_itemf(bContext *UNUS * where 'BW' will force grayscale even if the output format writes * as RGBA, this is age old blender convention and not sure how useful * it really is but keep it for now - campbell */ - char chan_flag = BKE_imtype_valid_channels(imf->imtype) | (is_render ? IMA_CHAN_FLAG_BW : 0); + char chan_flag = BKE_imtype_valid_channels(imf->imtype, true) | (is_render ? IMA_CHAN_FLAG_BW : 0); #ifdef WITH_FFMPEG /* a WAY more crappy case than B&W flag: depending on codec, file format MIGHT support |