Bunch of gcc 4.0 warning fixes.
[blender.git] / source / blender / imbuf / intern / readimage.c
index bbb423fa2d267b70c2d7cbe2eac866cf33647147..4cae5cace16a93322679100e72b9c2cd31cb31a5 100644 (file)
@@ -119,17 +119,8 @@ ImBuf *IMB_ibImageFromMemory(int *mem, int size, int flags) {
                        }
                }
 
-               /* let quicktime handle png's, skips error messages ;)
-                * but only on windows
-                */
-#ifdef _WIN32
-               if(G.have_quicktime == FALSE) {
-#else
-               if(1) {
-#endif
-                       ibuf = imb_loadpng((uchar *)mem, size, flags);
-                       if (ibuf) return(ibuf);
-               }
+               ibuf = imb_loadpng((uchar *)mem, size, flags);
+               if (ibuf) return(ibuf);
 
                ibuf = imb_bmp_decode((uchar *)mem, size, flags);
                if (ibuf) return(ibuf);