[Bf-blender-cvs] [a39ab9c] master: Fix T49815: Blender always reverts to RGBA when using Save As Image.
Bastien Montagne
noreply at git.blender.org
Tue Oct 25 18:01:15 CEST 2016
Commit: a39ab9cfdecd4ab6e9e4e0214d2ca6ab1181dd1b
Author: Bastien Montagne
Date: Tue Oct 25 17:59:45 2016 +0200
Branches: master
https://developer.blender.org/rBa39ab9cfdecd4ab6e9e4e0214d2ca6ab1181dd1b
Fix T49815: Blender always reverts to RGBA when using Save As Image.
`BKE_imformat_defaults()` was doing some weird black magic based on
imbuf's channels, instead of merely copying imbuf's planes here...
===================================================================
M source/blender/blenkernel/intern/image.c
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index a4eef2f..df3a763 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -1580,24 +1580,7 @@ void BKE_imbuf_to_image_format(struct ImageFormatData *im_format, const ImBuf *i
}
/* planes */
- /* TODO(sergey): Channels doesn't correspond actual planes used for image buffer
- * For example byte buffer will have 4 channels but it might easily
- * be BW or RGB image.
- *
- * Need to use im_format->planes = imbuf->planes instead?
- */
- switch (imbuf->channels) {
- case 0:
- case 4: im_format->planes = R_IMF_PLANES_RGBA;
- break;
- case 3: im_format->planes = R_IMF_PLANES_RGB;
- break;
- case 1: im_format->planes = R_IMF_PLANES_BW;
- break;
- default: im_format->planes = R_IMF_PLANES_RGB;
- break;
- }
-
+ im_format->planes = imbuf->planes;
}
More information about the Bf-blender-cvs
mailing list