[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4136] contrib/py/scripts/addons: Changes for recent image alpha rework.

[Sergey Sharybin]

Revision: 4136
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4136
Author:   nazgul
Date:     2013-01-04 07:56:42 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Changes for recent image alpha rework.

Addons maintainers, please double check the changes.

Modified Paths:
--------------
    contrib/py/scripts/addons/io_directx_bel/bel/image.py
    contrib/py/scripts/addons/sequencer_extra_actions/operators_extra_actions.py

Modified: contrib/py/scripts/addons/io_directx_bel/bel/image.py
===================================================================
--- contrib/py/scripts/addons/io_directx_bel/bel/image.py	2013-01-03 23:42:14 UTC (rev 4135)
+++ contrib/py/scripts/addons/io_directx_bel/bel/image.py	2013-01-04 07:56:42 UTC (rev 4136)
@@ -12,7 +12,7 @@
 
 # create or retrieve a bdata image
 # given its path 
-def new(path, name=False, relative = True, premul = True) :
+def new(path, name=False, relative = True) :
     path = fs.clean(path)
     # check file
     if fs.isfile(path) == False :
@@ -41,7 +41,6 @@
     # finally :
     img = bpy.data.images.load(filepath=path)
     img.name = name
-    img.use_premultiply = premul
     return img
 
 
@@ -159,10 +158,6 @@
     tex.use_alpha = alpha
     tex.use_preview_alpha = alpha
 
-    # IMAGE
-    if type(img) != type(None) :
-        img.use_premultiply = True
-
 def BSshader(nodes,pointer) :
     tkm = bpy.context.scene.tkm
     typ, nodename = pointer.split(' ')
@@ -235,7 +230,6 @@
                 return mat
             img = bpy.data.images.load(filepath=imgpath+ext)
             img.name = imgname
-            img.use_premultiply = True
         else : img = bpy.data.images[imgname]
         
         '''

Modified: contrib/py/scripts/addons/sequencer_extra_actions/operators_extra_actions.py
===================================================================
--- contrib/py/scripts/addons/sequencer_extra_actions/operators_extra_actions.py	2013-01-03 23:42:14 UTC (rev 4135)
+++ contrib/py/scripts/addons/sequencer_extra_actions/operators_extra_actions.py	2013-01-04 07:56:42 UTC (rev 4136)
@@ -902,7 +902,7 @@
     ('deinterlace', 'Filter - De-Interlace', ''),
     ('flip', 'Filter - Flip', ''),
     ('float', 'Filter - Convert Float', ''),
-    ('premultiply', 'Filter - Premultiply', ''),
+    ('alpha_mode', 'Filter - Alpha Mode', ''),
     ('reverse', 'Filter - Backwards', ''),
     # SOUND
     ('pan', 'Sound - Pan', ''),
@@ -994,8 +994,8 @@
                         i.use_flip_y = strip.use_flip_y
                     elif self.prop == 'float':
                         i.use_float = strip.use_float
-                    elif self.prop == 'premultiply':
-                        i.use_premultiply = strip.use_premultiply
+                    elif self.prop == 'alpha_mode':
+                        i.alpha_mode = strip.alpha_mode
                     elif self.prop == 'reverse':
                         i.use_reverse_frames = strip.use_reverse_frames
                     elif self.prop == 'pan':