diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-20 19:06:46 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-20 19:06:46 +0400 |
| commit | 874c29cea8e6f9bc411fccf2d6f4cb07e94328d0 (patch) | |
| tree | 5971e577cf7c02e05a1e37b5ad058c71a6744877 /release/scripts/image_auto_layout.py | |
| parent | 7555bfa793a2b0fc187c6211c56986f35b2d7b09 (diff) | |
| parent | c5bc4e4fb1a33eda8c31f2ea02e91f32f74c8fa5 (diff) | |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD
Notes:
* blenderbuttons and ICON_SNAP_PEEL_OBJECT were not merged.
Diffstat (limited to 'release/scripts/image_auto_layout.py')
| -rw-r--r-- | release/scripts/image_auto_layout.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/release/scripts/image_auto_layout.py b/release/scripts/image_auto_layout.py index c6f97a25434..d19ba1da662 100644 --- 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 |