[#18479] 'Consolidate into one image' does not calculate/use 'pixel margin'

Thanks to Dusan Stevanovic for pointing out the fix.

Also noticed alpha wasn't being rendered, enabled texface alpha.

diff --git a/release/scripts/image_auto_layout.py b/release/scripts/image_auto_layout.py
index c6f97a25434f9ae00da9091f528ca3e3003b433d..d19ba1da6629737db1056f7786e5fd37bbd6766e 100644 (file)
--- a/release/scripts/image_auto_layout.py
+++ b/release/scripts/image_auto_layout.py
@@ -9,7 +9,7 @@ Tooltip: 'Pack all texture images into 1 image and remap faces.'
 
 __author__ = "Campbell Barton"
 __url__ = ("blender", "blenderartists.org")
-__version__ = "1.1 2007/02/15"
+__version__ = "1.1a 2009/04/01"
 
 __bpydoc__ = """\
 This script makes a new image from the used areas of all the images mapped to the selected mesh objects.
@@ -273,9 +273,12 @@ def consolidate_mesh_images(mesh_list, scn, PREF_IMAGE_PATH, PREF_IMAGE_SIZE, PR
        
        # New Mesh and Object
        render_mat= B.Material.New()
-       render_mat.mode |= B.Material.Modes.SHADELESS
-       render_mat.mode |= B.Material.Modes.TEXFACE
-       render_mat.mode |= B.Material.Modes.ZTRANSP
+       render_mat.mode |= \
+                       B.Material.Modes.SHADELESS | \
+                       B.Material.Modes.TEXFACE | \
+                       B.Material.Modes.TEXFACE_ALPHA | \
+                       B.Material.Modes.ZTRANSP
+       
        render_mat.setAlpha(0.0)
                
        render_me= B.Mesh.New()
@@ -420,7 +423,7 @@ def main():
        
        PREF_IMAGE_PATH= PREF_IMAGE_PATH.val
        PREF_IMAGE_SIZE= PREF_IMAGE_SIZE.val
-       PREF_IMAGE_MARGIN= PREF_IMAGE_MARGIN.val
+       PREF_IMAGE_MARGIN= float(PREF_IMAGE_MARGIN.val) # important this is a float otherwise division wont work properly
        PREF_KEEP_ASPECT= PREF_KEEP_ASPECT.val
        PREF_ALL_SEL_OBS= PREF_ALL_SEL_OBS.val