From db7457a6bb70aa4b9d10aff3638cea9cda25a2ce Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 17 Mar 2008 20:57:16 +0000 Subject: Fix for bug #6758: material nodes were not working correct with ray mirror and transparency, was using the same stack for all recursion depths, now creates new stacks as needed. Fix for bug #8592: crash saving non-float image as 16bit tiff. --- source/blender/imbuf/intern/tiff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/imbuf') diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c index dfa4e5831ba..eaa80865f08 100644 --- a/source/blender/imbuf/intern/tiff.c +++ b/source/blender/imbuf/intern/tiff.c @@ -484,7 +484,7 @@ short imb_savetiff(struct ImBuf *ibuf, char *name, int flags) /* allocate array for pixel data */ npixels = ibuf->x * ibuf->y; - if(ibuf->ftype & TIF_16BIT) + if(bitspersample == 16) pixels16 = (unsigned short*)libtiff__TIFFmalloc(npixels * samplesperpixel * sizeof(unsigned short)); else @@ -499,7 +499,7 @@ short imb_savetiff(struct ImBuf *ibuf, char *name, int flags) } /* setup pointers */ - if(ibuf->ftype & TIF_16BIT) { + if(bitspersample == 16) { fromf = ibuf->rect_float; to16 = pixels16; } -- cgit v1.2.3