diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-09-29 12:34:37 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-03 17:09:27 +0400 |
| commit | 8a03a51c330ad90d8efb9b1b5e44863aaf0caf0e (patch) | |
| tree | e4059f60ac869d236e37ad09bd71f5a7282929e1 /source/blender | |
| parent | f9c602f1beea6440bb6c49bfa225eab3d012ee4f (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')
| -rw-r--r-- | source/blender/imbuf/intern/readimage.c | 2 |
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 */ |