[Bf-blender-cvs] [73676e5] gooseberry_farm: Gooseberry farm: Correction to previous commit

[Sergey Sharybin]

Commit: 73676e57a1d6eedea25112743f6fd1ae15c0b768
Author: Sergey Sharybin
Date:   Mon Jul 27 22:41:54 2015 +0200
Branches: gooseberry_farm
https://developer.blender.org/rB73676e57a1d6eedea25112743f6fd1ae15c0b768

Gooseberry farm: Correction to previous commit

Initial patch was done against imbuf with ftype refactor applied.

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

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

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

diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index e8dd8a8..e3a08d6 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -616,7 +616,7 @@ static opj_image_t *ibuftoimage(ImBuf *ibuf, opj_cparameters_t *parameters)
 			cinema_parameters(parameters);
 		}
 		
-		color_space = (ibuf->foptions.flag & JP2_YCC) ? CLRSPC_SYCC : CLRSPC_SRGB;
+		color_space = (ibuf->ftype & JP2_YCC) ? CLRSPC_SYCC : CLRSPC_SRGB;
 		prec = 12;
 		numcomps = 3;
 	}