diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-05-24 15:40:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-05-24 15:40:45 +0400 |
| commit | 4178b44b353e51139954d4b954e9234cdc172507 (patch) | |
| tree | 1186f099370c575074126de16797c07260901efd /source/blender/imbuf/intern/tiff.c | |
| parent | 6c01b7b4f84b3a81836a372ec14e4ba6793b6ad9 (diff) | |
- correct --help message
- fix implicit decloration of DAG_scene_sort()
- same fix for tiff as made in renderbranch
- rename 'combined peak' --> 'peak' for shorter messages while rendering.
Diffstat (limited to 'source/blender/imbuf/intern/tiff.c')
| -rw-r--r-- | source/blender/imbuf/intern/tiff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c index 1e4b2ea7110..488340aec88 100644 --- a/source/blender/imbuf/intern/tiff.c +++ b/source/blender/imbuf/intern/tiff.c @@ -594,7 +594,6 @@ ImBuf *imb_loadtiff(unsigned char *mem, int size, int flags) hbuf= IMB_allocImBuf(width, height, 32, 0, 0); hbuf->miplevel= level; - hbuf->flags |= IB_tilecache; hbuf->ftype= ibuf->ftype; ibuf->mipmap[level-1] = hbuf; @@ -604,6 +603,8 @@ ImBuf *imb_loadtiff(unsigned char *mem, int size, int flags) else hbuf= ibuf; + hbuf->flags |= IB_tilecache; + TIFFGetField(image, TIFFTAG_TILEWIDTH, &hbuf->tilex); TIFFGetField(image, TIFFTAG_TILELENGTH, &hbuf->tiley); |