[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13871] trunk/blender/source/blender:

[Brecht Van Lommel]

Revision: 13871
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13871
Author:   blendix
Date:     2008-02-26 12:38:32 +0100 (Tue, 26 Feb 2008)

Log Message:
-----------

Bugfix: recent rollback of premul changes gave issues. The premul
flag bit was changed and not changed back, and the flag was moved
back from image user to image. This meant that files saved both
before and during the premul changes did not read premul settings
correct anymore.

Now it uses the old premul flag bit again, which also keeps forward
compatibility.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/makesdna/DNA_image_types.h

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2008-02-26 09:55:07 UTC (rev 13870)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2008-02-26 11:38:32 UTC (rev 13871)
@@ -4644,10 +4644,13 @@
 	}
 }
 
-static void ntree_version_245(bNodeTree *ntree)
+static void ntree_version_245(FileData *fd, Library *lib, bNodeTree *ntree)
 {
 	bNode *node;
 	NodeTwoFloats *ntf;
+	ID *nodeid;
+	Image *image;
+	ImageUser *iuser;
 
 	if(ntree->type==NTREE_COMPOSIT) {
 		for(node= ntree->nodes.first; node; node= node->next) {
@@ -4659,6 +4662,21 @@
 						ntf->x= 1.0f;
 				}
 			}
+			
+			/* fix for temporary flag changes during 245 cycle */
+			nodeid= newlibadr(fd, lib, node->id);
+			if(node->storage && nodeid && GS(nodeid->name) == ID_IM) {
+				image= (Image*)nodeid;
+				iuser= node->storage;
+				if(iuser->flag & IMA_OLD_PREMUL) {
+					iuser->flag &= ~IMA_OLD_PREMUL;
+					iuser->flag |= IMA_DO_PREMUL;
+				}
+				if(iuser->flag & IMA_DO_PREMUL) {
+					image->flag &= ~IMA_OLD_PREMUL;
+					image->flag |= IMA_DO_PREMUL;
+				}
+			}
 		}
 	}
 }
@@ -6846,6 +6864,7 @@
 		World *wrld;
 		Mesh *me;
 		bNodeTree *ntree;
+		Tex *tex;
 		
 		/* unless the file was created 2.44.3 but not 2.45, update the constraints */
 		if ( !(main->versionfile==244 && main->subversionfile==3) &&
@@ -7032,7 +7051,7 @@
 
 		for(sce= main->scene.first; sce; sce= sce->id.next) {
 			if(sce->nodetree)
-				ntree_version_245(sce->nodetree);
+				ntree_version_245(fd, lib, sce->nodetree);
 
 			if(sce->r.simplify_shadowsamples == 0) {
 				sce->r.simplify_subsurf= 6;
@@ -7043,8 +7062,30 @@
 		}
 
 		for(ntree=main->nodetree.first; ntree; ntree= ntree->id.next)
-			ntree_version_245(ntree);
+			ntree_version_245(fd, lib, ntree);
 
+		/* fix for temporary flag changes during 245 cycle */
+		for(ima= main->image.first; ima; ima= ima->id.next) {
+			if(ima->flag & IMA_OLD_PREMUL) {
+				ima->flag &= ~IMA_OLD_PREMUL;
+				ima->flag |= IMA_DO_PREMUL;
+			}
+		}
+
+		for(tex=main->tex.first; tex; tex=tex->id.next) {
+			if(tex->iuser.flag & IMA_OLD_PREMUL) {
+				tex->iuser.flag &= ~IMA_OLD_PREMUL;
+				tex->iuser.flag |= IMA_DO_PREMUL;
+
+			}
+
+			ima= newlibadr(fd, lib, tex->ima);
+			if(ima && (tex->iuser.flag & IMA_DO_PREMUL)) { 
+				ima->flag &= ~IMA_OLD_PREMUL;
+				ima->flag |= IMA_DO_PREMUL;
+			}
+		}
+
 		if (main->versionfile < 245 || main->subversionfile < 12)
 		{
 			/* initialize skeleton generation toolsettings */

Modified: trunk/blender/source/blender/makesdna/DNA_image_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_image_types.h	2008-02-26 09:55:07 UTC (rev 13870)
+++ trunk/blender/source/blender/makesdna/DNA_image_types.h	2008-02-26 11:38:32 UTC (rev 13871)
@@ -58,6 +58,7 @@
 /* iuser->flag */
 #define	IMA_ANIM_ALWAYS		1
 #define IMA_ANIM_REFRESHED	2
+/* #define IMA_DO_PREMUL	4 */
 
 typedef struct Image {
 	ID id;
@@ -104,11 +105,12 @@
 /* flag */
 #define IMA_FIELDS		1
 #define IMA_STD_FIELD	2
+#define IMA_DO_PREMUL	4
 
 #define	IMA_REFLECT		16
 #define IMA_NOCOLLECT   32
 #define IMA_ANTIALI		64
-#define IMA_DO_PREMUL	128
+#define IMA_OLD_PREMUL	128
 
 /* tpageflag */
 #define IMA_TILES			1