[Bf-blender-cvs] [3eb38a7] master: Loading raw targa now sets the filetype
Campbell Barton
noreply at git.blender.org
Thu Jun 4 08:39:10 CEST 2015
Commit: 3eb38a79d8843ef57e41156371058f7fb0d8dd6f
Author: Campbell Barton
Date: Thu Jun 4 16:36:11 2015 +1000
Branches: master
https://developer.blender.org/rB3eb38a79d8843ef57e41156371058f7fb0d8dd6f
Loading raw targa now sets the filetype
===================================================================
M source/blender/imbuf/intern/targa.c
===================================================================
diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c
index 70b71ec..40dcdc9 100644
--- a/source/blender/imbuf/intern/targa.c
+++ b/source/blender/imbuf/intern/targa.c
@@ -568,7 +568,7 @@ ImBuf *imb_loadtarga(unsigned char *mem, size_t mem_size, int flags, char colors
else ibuf = IMB_allocImBuf(tga.xsize, tga.ysize, (tga.pixsize + 0x7) & ~0x7, IB_rect);
if (ibuf == NULL) return NULL;
- ibuf->ftype = TGA;
+ ibuf->ftype = (tga.imgtyp < 4) ? RAWTGA : TGA;
mem = mem + 18 + tga.numid;
cp[0] = 0xff;
More information about the Bf-blender-cvs
mailing list