[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28951] branches/render25/source/blender/ imbuf/intern/tiff.c: own merg from trunk broke tiff loading r28950

[Campbell Barton]

Revision: 28951
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28951
Author:   campbellbarton
Date:     2010-05-24 12:04:54 +0200 (Mon, 24 May 2010)

Log Message:
-----------
own merg from trunk broke tiff loading  r28950

Modified Paths:
--------------
    branches/render25/source/blender/imbuf/intern/tiff.c

Modified: branches/render25/source/blender/imbuf/intern/tiff.c
===================================================================
--- branches/render25/source/blender/imbuf/intern/tiff.c	2010-05-24 08:25:40 UTC (rev 28950)
+++ branches/render25/source/blender/imbuf/intern/tiff.c	2010-05-24 10:04:54 UTC (rev 28951)
@@ -594,7 +594,6 @@
 
 					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 @@
 				else
 					hbuf= ibuf;
 
+				hbuf->flags |= IB_tilecache;
+
 				TIFFGetField(image, TIFFTAG_TILEWIDTH, &hbuf->tilex);
 				TIFFGetField(image, TIFFTAG_TILELENGTH, &hbuf->tiley);