[Bf-blender-cvs] [e78b03f] master: Fix part of code in `load_image_single()` wrongly disabled when WITH_OPENEXR was disabled.

[Bastien Montagne]

Commit: e78b03f9e9bb8aaba7c02c9f5d26a85ddfe2079c
Author: Bastien Montagne
Date:   Sat Jun 27 09:52:52 2015 +0200
Branches: master
https://developer.blender.org/rBe78b03f9e9bb8aaba7c02c9f5d26a85ddfe2079c

Fix part of code in `load_image_single()` wrongly disabled when WITH_OPENEXR was disabled.

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

M	source/blender/blenkernel/intern/image.c

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

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 3cc5905..45ae390 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3441,7 +3441,9 @@ static ImBuf *load_image_single(
 				ibuf = NULL;
 			}
 		}
-		else {
+		else
+#endif
+		{
 			image_initialize_after_load(ima, ibuf);
 			*r_assign = true;
 
@@ -3457,10 +3459,6 @@ static ImBuf *load_image_single(
 				imapf->packedfile = newPackedFile(NULL, filepath, ID_BLEND_PATH(G.main, &ima->id));
 			}
 		}
-#else
-		image_initialize_after_load(ima, ibuf);
-		*r_assign = true;
-#endif
 	}
 	else {
 		ima->ok = 0;