ifdef check for WITH_OPENEXR was removed from readimage for some reason

causing building without OPENEXR to fail.  (Hopefully this doesn't mess up
current scons stuff, shouldn't but I haven't tested it after latest
changes in scons)

(I also cleaned up the Makefile a tad so it didn't check twice for WITH_OPENEXR)

Kent

source/blender/imbuf/intern/Makefile

@@ -41,6 +41,7 @@ include nan_definitions.mk
 
 ifeq ($(WITH_OPENEXR), true)
     DIRS = openexr
+    CFLAGS += -DWITH_OPENEXR
 endif
 
 
@@ -48,10 +49,6 @@ ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windo
     CFLAGS += -funsigned-char
 endif
 
-ifeq ($(WITH_OPENEXR), true)
-    CFLAGS += -DWITH_OPENEXR
-endif
-
 CFLAGS += $(LEVEL_1_C_WARNINGS)
 
 CPPFLAGS += -I$(NAN_JPEG)/include

source/blender/imbuf/intern/readimage.c

@@ -142,8 +142,10 @@ ImBuf *IMB_ibImageFromMemory(int *mem, int size, int flags) {
 		ibuf = imb_loadhdr((uchar*)mem, size, flags);
 		if (ibuf) return (ibuf);
 
+#ifdef WITH_OPENEXR
 		ibuf = imb_load_openexr((uchar *)mem, size, flags);
 		if (ibuf) return (ibuf);
+#endif
 		
 #ifdef WITH_QUICKTIME
 #if defined(_WIN32) || defined (__APPLE__)