[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29124] trunk/blender/source/blender: passepartout overlay wasnt written into thumbnails

[Campbell Barton]

Revision: 29124
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29124
Author:   campbellbarton
Date:     2010-06-01 15:06:13 +0200 (Tue, 01 Jun 2010)

Log Message:
-----------
passepartout overlay wasnt written into thumbnails

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/IMB_thumbs.h
    trunk/blender/source/blender/imbuf/intern/thumbs.c
    trunk/blender/source/blender/imbuf/intern/thumbs_blend.c
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/imbuf/IMB_thumbs.h
===================================================================
--- trunk/blender/source/blender/imbuf/IMB_thumbs.h	2010-06-01 12:13:07 UTC (rev 29123)
+++ trunk/blender/source/blender/imbuf/IMB_thumbs.h	2010-06-01 13:06:13 UTC (rev 29124)
@@ -73,7 +73,7 @@
 
 /* special function for loading a thumbnail embedded into a blend file */
 ImBuf *IMB_loadblend_thumb(const char *path);
-void IMB_overlayblend_thumb(int *thumb, int width, int height, float aspect);
+void IMB_overlayblend_thumb(unsigned int *thumb, int width, int height, float aspect);
 
 
 #endif /* _IMB_THUMBS_H */

Modified: trunk/blender/source/blender/imbuf/intern/thumbs.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/thumbs.c	2010-06-01 12:13:07 UTC (rev 29123)
+++ trunk/blender/source/blender/imbuf/intern/thumbs.c	2010-06-01 13:06:13 UTC (rev 29124)
@@ -347,9 +347,7 @@
 		if (IMB_saveiff(img, temp, IB_rect | IB_metadata)) {
 #ifndef WIN32
 			chmod(temp, S_IRUSR | S_IWUSR);
-#endif
-			printf("Saving: %s\n", tpath);
-			
+#endif	
 			BLI_rename(temp, tpath);
 		}
 

Modified: trunk/blender/source/blender/imbuf/intern/thumbs_blend.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/thumbs_blend.c	2010-06-01 12:13:07 UTC (rev 29123)
+++ trunk/blender/source/blender/imbuf/intern/thumbs_blend.c	2010-06-01 13:06:13 UTC (rev 29124)
@@ -131,7 +131,7 @@
 /* add a fake passepartout overlay to a byte buffer, use for blend file thumbnails */
 #define MARGIN 2
 
-void IMB_overlayblend_thumb(int *thumb, int width, int height, float aspect)
+void IMB_overlayblend_thumb(unsigned int *thumb, int width, int height, float aspect)
 {
 	unsigned char *px= (unsigned char *)thumb;
 	int margin_l = MARGIN;

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-06-01 12:13:07 UTC (rev 29123)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-06-01 13:06:13 UTC (rev 29124)
@@ -510,6 +510,9 @@
 
 		/* dirty oversampling */
 		IMB_scaleImBuf(ibuf, BLEN_THUMB_SIZE, BLEN_THUMB_SIZE);
+
+		/* add pretty overlay */
+		IMB_overlayblend_thumb(ibuf->rect, ibuf->x, ibuf->y, aspect);
 		
 		/* first write into thumb buffer */
 		thumb= MEM_mallocN(((2 + (BLEN_THUMB_SIZE * BLEN_THUMB_SIZE))) * sizeof(int), "write_file thumb");
@@ -518,9 +521,6 @@
 		thumb[1] = BLEN_THUMB_SIZE;
 
 		memcpy(thumb + 2, ibuf->rect, BLEN_THUMB_SIZE * BLEN_THUMB_SIZE * sizeof(int));
-		
-		/* add pretty overlay */
-		IMB_overlayblend_thumb(thumb + 2, BLEN_THUMB_SIZE, BLEN_THUMB_SIZE, aspect);
 	}
 	else {
 		/* '*thumb_pt' needs to stay NULL to prevent a bad thumbnail from being handled */