From 4178b44b353e51139954d4b954e9234cdc172507 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 24 May 2010 11:40:45 +0000 Subject: - 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. --- source/blender/imbuf/intern/anim.c | 1 + source/blender/imbuf/intern/tiff.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/imbuf/intern') diff --git a/source/blender/imbuf/intern/anim.c b/source/blender/imbuf/intern/anim.c index bc0f9225fbc..2cb63b7274c 100644 --- a/source/blender/imbuf/intern/anim.c +++ b/source/blender/imbuf/intern/anim.c @@ -62,6 +62,7 @@ BLI_countlist BLI_stringdec */ #include "DNA_userdef_types.h" #include "BKE_global.h" +#include "BKE_depsgraph.h" #include "imbuf.h" 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); -- cgit v1.2.3