[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12704] trunk/blender/source/blender: Images now have option to be tagged "convert to premul".

[Ton Roosendaal]

Revision: 12704
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12704
Author:   ton
Date:     2007-11-28 13:32:25 +0100 (Wed, 28 Nov 2007)

Log Message:
-----------
Images now have option to be tagged "convert to premul".
Option available in the Image (properties) panel. 

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c
    trunk/blender/source/blender/makesdna/DNA_image_types.h
    trunk/blender/source/blender/src/buttons_shading.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2007-11-28 12:11:06 UTC (rev 12703)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2007-11-28 12:32:25 UTC (rev 12704)
@@ -1560,6 +1560,9 @@
 			if ((ima->packedfile == NULL) && (G.fileflags & G_AUTOPACK))
 				ima->packedfile = newPackedFile(str);
 		}
+		
+		if(ima->flag & IMA_DO_PREMUL)
+			converttopremul(ibuf);
 	}
 	else
 		ima->ok= 0;

Modified: trunk/blender/source/blender/makesdna/DNA_image_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_image_types.h	2007-11-28 12:11:06 UTC (rev 12703)
+++ trunk/blender/source/blender/makesdna/DNA_image_types.h	2007-11-28 12:32:25 UTC (rev 12704)
@@ -108,8 +108,8 @@
 #define	IMA_REFLECT		16
 #define IMA_NOCOLLECT   32
 #define IMA_ANTIALI		64
+#define IMA_DO_PREMUL	128
 
-
 /* tpageflag */
 #define IMA_TILES			1
 #define IMA_TWINANIM		2

Modified: trunk/blender/source/blender/src/buttons_shading.c
===================================================================
--- trunk/blender/source/blender/src/buttons_shading.c	2007-11-28 12:11:06 UTC (rev 12703)
+++ trunk/blender/source/blender/src/buttons_shading.c	2007-11-28 12:32:25 UTC (rev 12704)
@@ -1174,9 +1174,12 @@
 		 but= uiDefButBitS(block, TOG, IMA_FIELDS, imagechanged, "Fields",	10, 90, 100, 20, &ima->flag, 0, 0, 0, 0, "Click to enable use of fields in Image");
 		 uiButSetFunc(but, image_field_test, ima, iuser);
 		 uiDefButBitS(block, TOG, IMA_STD_FIELD, B_NOP, "Odd",			10, 70, 100, 20, &ima->flag, 0, 0, 0, 0, "Standard Field Toggle");
-		 uiBlockEndAlign(block);
 		 
+		 uiBlockBeginAlign(block);
+		 uiBlockSetFunc(block, image_reload_cb, ima, iuser);
 		 uiDefButBitS(block, TOG, IMA_ANTIALI, B_NOP, "Anti",			10, 35, 100, 20, &ima->flag, 0, 0, 0, 0, "Toggles Image anti-aliasing, only works with solid colors");
+		 uiDefButBitS(block, TOG, IMA_DO_PREMUL, imagechanged, "Premul",		110, 35, 100, 20, &ima->flag, 0, 0, 0, 0, "Toggles premultiplying alpha");
+		 uiBlockEndAlign(block);
 		 
 		 if( ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
 			 sprintf(str, "(%d) Frames:", iuser->framenr);