Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-09-29 12:34:37 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-09-29 12:34:37 +0400
commitab8e709d67ca6545f74ba41174773c933ae8b419 (patch)
tree647a8c08b0e9c3a6249e663aa1da5de9548f721b /source/blender/imbuf/intern/readimage.c
parent516dbaeb7333fbfd27bf22917ba51f028171b09a (diff)
Fix for wrong color space when image loader set both rect and rect_float
Quite safe for 2.72.
Diffstat (limited to 'source/blender/imbuf/intern/readimage.c')
-rw-r--r--source/blender/imbuf/intern/readimage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c
index f0bcfcea62d..bb09c57d1e5 100644
--- a/source/blender/imbuf/intern/readimage.c
+++ b/source/blender/imbuf/intern/readimage.c
@@ -58,7 +58,7 @@ static void imb_handle_alpha(ImBuf *ibuf, int flags, char colorspace[IM_MAX_SPAC
int alpha_flags;
if (colorspace) {
- if (ibuf->rect) {
+ if (ibuf->rect != NULL && ibuf->rect_float == NULL) {
/* byte buffer is never internally converted to some standard space,
* store pointer to it's color space descriptor instead
*/