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/blenkernel/intern/image.c | |
| 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/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 7d8ada0fa68..b74424a1d28 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1161,16 +1161,18 @@ int BKE_imtype_requires_linear_float(const char imtype) return 0; } -char BKE_imtype_valid_channels(const char imtype) +char BKE_imtype_valid_channels(const char imtype, bool write_file) { char chan_flag = IMA_CHAN_FLAG_RGB; /* assume all support rgb */ /* alpha */ switch (imtype) { + case R_IMF_IMTYPE_BMP: + if (write_file) break; + /* fall-through */ case R_IMF_IMTYPE_TARGA: case R_IMF_IMTYPE_IRIS: case R_IMF_IMTYPE_PNG: - /* case R_IMF_IMTYPE_BMP: */ /* read but not write */ case R_IMF_IMTYPE_RADHDR: case R_IMF_IMTYPE_TIFF: case R_IMF_IMTYPE_OPENEXR: |