[Bf-blender-cvs] [ab8e709] master: Fix for wrong color space when image loader set both rect and rect_float

[Sergey Sharybin]

Commit: ab8e709d67ca6545f74ba41174773c933ae8b419
Author: Sergey Sharybin
Date:   Mon Sep 29 14:34:37 2014 +0600
Branches: master
https://developer.blender.org/rBab8e709d67ca6545f74ba41174773c933ae8b419

Fix for wrong color space when image loader set both rect and rect_float

Quite safe for 2.72.

===================================================================

M	source/blender/imbuf/intern/readimage.c

===================================================================

diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c
index f0bcfce..bb09c57 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
 			 */