diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-03-17 23:57:16 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-03-17 23:57:16 +0300 |
| commit | db7457a6bb70aa4b9d10aff3638cea9cda25a2ce (patch) | |
| tree | 02021eac483aacdcd32439f1a445be12b6b483b9 /source/blender/imbuf/intern/tiff.c | |
| parent | bc7b18131b47c5a3638783e2138e2955e921f829 (diff) | |
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.
Diffstat (limited to 'source/blender/imbuf/intern/tiff.c')
| -rw-r--r-- | source/blender/imbuf/intern/tiff.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |