projects
/
blender.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This looks like a lot but its a few small changes.
[blender.git]
/
source
/
blender
/
imbuf
/
intern
/
readimage.c
diff --git
a/source/blender/imbuf/intern/readimage.c
b/source/blender/imbuf/intern/readimage.c
index fb574bf7da84eee74ba4ac40c19f8873c4f9e11f..f15d35053740d5575d364c33164bae698f2ab1c3 100644
(file)
--- a/
source/blender/imbuf/intern/readimage.c
+++ b/
source/blender/imbuf/intern/readimage.c
@@
-127,7
+127,7
@@
ImBuf *IMB_ibImageFromMemory(int *mem, int size, int flags) {
#else
if(1) {
#endif
#else
if(1) {
#endif
- ibuf = imb_
png_decode
((uchar *)mem, size, flags);
+ ibuf = imb_
loadpng
((uchar *)mem, size, flags);
if (ibuf) return(ibuf);
}
if (ibuf) return(ibuf);
}