[Bf-blender-cvs] [cc7b45a] multiview: From review: revert uneeded change in branch
Dalai Felinto
noreply at git.blender.org
Tue Nov 25 18:56:57 CET 2014
Commit: cc7b45ae1ffc569bc9b67de67cbee0ca758d4a6f
Author: Dalai Felinto
Date: Tue Nov 25 13:42:40 2014 -0200
Branches: multiview
https://developer.blender.org/rBcc7b45ae1ffc569bc9b67de67cbee0ca758d4a6f
>From review: revert uneeded change in branch
===================================================================
M source/blender/blenkernel/intern/image.c
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 1581c4c..dd691c7 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -1192,7 +1192,7 @@ int BKE_imtype_to_ftype(const char imtype)
else if (imtype == R_IMF_IMTYPE_TIFF)
return TIF;
#endif
- else if (ELEM(imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER))
+ else if (imtype == R_IMF_IMTYPE_OPENEXR || imtype == R_IMF_IMTYPE_MULTILAYER)
return OPENEXR;
#ifdef WITH_CINEON
else if (imtype == R_IMF_IMTYPE_CINEON)
@@ -1467,7 +1467,7 @@ static bool do_add_image_extension(char *string, const char imtype, const ImageF
}
#endif
#ifdef WITH_OPENEXR
- else if (ELEM(imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER)) {
+ else if (imtype == R_IMF_IMTYPE_OPENEXR || imtype == R_IMF_IMTYPE_MULTILAYER) {
if (!BLI_testextensie(string, extension_test = ".exr"))
extension = extension_test;
}
More information about the Bf-blender-cvs
mailing list