[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4603] contrib/py/scripts/addons/ uv_texture_atlas.py: reduced some lookups and renamed confusing vars

Campbell Barton ideasman42 at gmail.com
Tue Jun 25 18:26:09 CEST 2013


Revision: 4603
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4603
Author:   campbellbarton
Date:     2013-06-25 16:26:08 +0000 (Tue, 25 Jun 2013)
Log Message:
-----------
reduced some lookups and renamed confusing vars

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

Modified: contrib/py/scripts/addons/uv_texture_atlas.py
===================================================================
--- contrib/py/scripts/addons/uv_texture_atlas.py	2013-06-25 15:40:55 UTC (rev 4602)
+++ contrib/py/scripts/addons/uv_texture_atlas.py	2013-06-25 16:26:08 UTC (rev 4603)
@@ -152,7 +152,7 @@
             isAllObjVisible = check_all_objects_visible(self, context)
 
             if isAllObjVisible is True:
-                res = int(scene.ms_lightmap_groups[group.name].resolution)
+                res = int(group.resolution)
                 bpy.ops.object.ms_create_lightmap(
                     group_name=group.name, resolution=res)
                 bpy.ops.object.ms_merge_objects(
@@ -190,7 +190,7 @@
             isAllObjVisible = check_all_objects_visible(self, context)
 
             if isAllObjVisible is True:
-                res = int(scene.ms_lightmap_groups[group.name].resolution)
+                res = int(group.resolution)
                 bpy.ops.object.ms_create_lightmap(
                     group_name=group.name, resolution=res)
                 bpy.ops.object.ms_merge_objects(
@@ -461,8 +461,7 @@
                     obj.hide_render = False
                     obj.hide = False
 
-                bpy.data.groups.remove(
-                    bpy.data.groups[scene.ms_lightmap_groups[idx].name])
+                bpy.data.groups.remove(group)
 
             # Remove Lightmap Group
             scene.ms_lightmap_groups.remove(scene.ms_lightmap_groups_index)
@@ -590,7 +589,7 @@
             UVLIST.clear()  # clear array
 
             # create vertex groups for each selected object
-            scene.objects.active = bpy.data.objects[activeNowObject.name]
+            scene.objects.active = activeNowObject
             vgroup = activeNowObject.vertex_groups.new(name=object.name)
             vgroup.add(
                 list(range(len(activeNowObject.data.vertices))), weight=1.0, type='ADD')
@@ -651,23 +650,22 @@
                 obj.hide = False
                 ob_merged.select = True
                 groupSeparate = bpy.data.groups.new(ob_merged.name)
-                bpy.data.groups[groupSeparate.name].objects.link(ob_merged)
+                groupSeparate.objects.link(ob_merged)
                 ob_merged.select = False
 
                 OBJECTLIST = []
-                for object in ob_merged.ms_merged_objects:
-                    OBJECTLIST.append(object.name)
+                for ms_obj in ob_merged.ms_merged_objects:
+                    OBJECTLIST.append(ms_obj.name)
                     # select vertex groups and separate group from merged
                     # object
                     bpy.ops.object.select_all(action='DESELECT')
                     ob_merged.select = True
                     scene.objects.active = ob_merged
-                    # scene.objects[object.name]
-                    # scene.objects.active
+
                     bpy.ops.object.mode_set(mode='EDIT')
                     bpy.ops.mesh.select_all(action='DESELECT')
-                    context.active_object.vertex_groups.active_index = context.active_object.vertex_groups[
-                        object.name].index
+                    ob_merged.vertex_groups.active_index = ob_merged.vertex_groups[
+                        ms_obj.name].index
                     bpy.ops.object.vertex_group_select()
                     bpy.ops.mesh.separate(type='SELECTED')
                     bpy.ops.object.mode_set(mode='OBJECT', toggle=False)
@@ -681,9 +679,9 @@
                             break
 
                     # Copy UV Coordinates to the original mesh
-                    if object.name in scene.objects:
+                    if ms_obj.name in scene.objects:
                         ob_merged.select = False
-                        ob_original = scene.objects[object.name]
+                        ob_original = scene.objects[ms_obj.name]
                         ob_original.hide = False
                         ob_original.select = True
                         scene.objects.active = ob_separeted



More information about the Bf-extensions-cvs mailing list