diff options
Diffstat (limited to 'source/blender/imbuf/intern/readimage.c')
| -rw-r--r-- | source/blender/imbuf/intern/readimage.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index bbb423fa2d2..4cae5cace16 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -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); |