[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4645] trunk/py/scripts/addons/ uv_texture_atlas.py: [TextureAtlas] small refactoring of autoUnwrap.

[paul geraskin]

Revision: 4645
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4645
Author:   mifth
Date:     2013-07-30 19:36:40 +0000 (Tue, 30 Jul 2013)
Log Message:
-----------
[TextureAtlas] small refactoring of autoUnwrap.

Modified Paths:
--------------
    trunk/py/scripts/addons/uv_texture_atlas.py

Modified: trunk/py/scripts/addons/uv_texture_atlas.py
===================================================================
--- trunk/py/scripts/addons/uv_texture_atlas.py	2013-07-30 10:31:37 UTC (rev 4644)
+++ trunk/py/scripts/addons/uv_texture_atlas.py	2013-07-30 19:36:40 UTC (rev 4645)
@@ -525,7 +525,7 @@
         for object in NON_MESH_LIST:
             obj_group.objects.unlink(object)
 
-        NON_MESH_LIST.clear() # clear array
+        NON_MESH_LIST.clear()  # clear array
 
         return{'FINISHED'}
 
@@ -638,18 +638,23 @@
         bpy.ops.object.select_all(action='DESELECT')
         ob_merge.select = True
         scene.objects.active = ob_merge
-        bpy.ops.object.mode_set(mode='EDIT')
-        bpy.ops.mesh.select_all(action='SELECT')
 
-        if self.unwrap is True and scene.ms_lightmap_groups[self.group_name].unwrap_type == '0':
-            bpy.ops.uv.smart_project(
-                angle_limit=72.0, island_margin=0.2, user_area_weight=0.0)
-        elif self.unwrap is True and scene.ms_lightmap_groups[self.group_name].unwrap_type == '1':
-            bpy.ops.uv.lightmap_pack(
-                PREF_CONTEXT='ALL_FACES', PREF_PACK_IN_ONE=True, PREF_NEW_UVLAYER=False,
-                PREF_APPLY_IMAGE=False, PREF_IMG_PX_SIZE=1024, PREF_BOX_DIV=48, PREF_MARGIN_DIV=0.2)
-        bpy.ops.object.mode_set(mode='OBJECT', toggle=False)
+        if self.unwrap is True:
+            unwrapType = scene.ms_lightmap_groups[self.group_name].unwrap_type
 
+            if unwrapType == '0' or unwrapType == '1':
+                bpy.ops.object.mode_set(mode='EDIT')
+                bpy.ops.mesh.select_all(action='SELECT')
+
+            if unwrapType == '0':
+                bpy.ops.uv.smart_project(
+                    angle_limit=72.0, island_margin=0.2, user_area_weight=0.0)
+            elif unwrapType == '1':
+                bpy.ops.uv.lightmap_pack(
+                    PREF_CONTEXT='ALL_FACES', PREF_PACK_IN_ONE=True, PREF_NEW_UVLAYER=False,
+                    PREF_APPLY_IMAGE=False, PREF_IMG_PX_SIZE=1024, PREF_BOX_DIV=48, PREF_MARGIN_DIV=0.2)
+            bpy.ops.object.mode_set(mode='OBJECT', toggle=False)
+
         return{'FINISHED'}