[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13686] trunk/blender/source/blender/ blenkernel/intern/image.c: Reverted the change of auto-turning on premul for images from last

[Joseph Eagar]

Revision: 13686
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13686
Author:   joeedh
Date:     2008-02-14 13:44:27 +0100 (Thu, 14 Feb 2008)

Log Message:
-----------
Reverted the change of auto-turning on premul for images from last
commit.  I still think this is a good idea, but needs more discussion.

Basically, the way the premul option worked before is it actually
changed the image data to be premul (for each pixel it multipled r,g,b by a) when
loading an image.  So if a user wanted his image to be key, yet
still work in the renderer (which expects premul) he'd be stuck.
Also, it was kindof confusing how if you painted something in the image,
then saved it with premul on, when next you loaded the image it'd have
changed (especially since the image editor painting seems to paint in
key, not premul).

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2008-02-14 12:34:54 UTC (rev 13685)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2008-02-14 12:44:27 UTC (rev 13686)
@@ -276,7 +276,6 @@
 		
 		ima->source= source;
 		ima->type= type;
-		ima->flag = IMA_DO_PREMUL;
 	}
 	return ima;
 }