[#6][#98]Function cleanup fixes

travnick · Mar 14, 2016 · d055078 · d055078
1 parent c1ceae1
commit d055078
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/io_export_cryblend/__init__.py b/io_export_cryblend/__init__.py
@@ -341,7 +341,7 @@ def __add_proxy(self, object_):
         bpy.ops.object.origin_set(type="ORIGIN_CURSOR")
         object_.select = False
         bound_box.select = True
-        bpy.context.active_object = bound_box
+        utils.set_active(bound_box)
         bpy.ops.object.origin_set(type="ORIGIN_CURSOR")
         bpy.context.scene.cursor_location = old_cursor
 
@@ -390,7 +390,7 @@ def execute(self, context):
                     selected_vert[2]))
             empty_object = bpy.context.active_object
             empty_object.name = name_branch(True)
-            bpy.context.active_object = active_object
+            utils.set_active(active_object)
             bpy.ops.object.mode_set(mode='EDIT')
 
             message = "Adding Branch"
@@ -429,7 +429,7 @@ def execute(self, context):
                     selected_vert[2]))
             empty_object = bpy.context.active_object
             empty_object.name = name_branch(False)
-            bpy.context.active_object = active_object
+            utils.set_active(active_object)
             bpy.ops.object.mode_set(mode='EDIT')
 
             message = "Adding Branch Joint"
@@ -1511,7 +1511,7 @@ def execute(self, context):
                     uv = True
                     break
                 if not uv:
-                    bpy.context.active_object = object_
+                    utils.set_active(object_)
                     bpy.ops.mesh.uv_texture_add()
                     message = "Added UV map to {}".format(object_.name)
                     self.report({'INFO'}, message)

diff --git a/io_export_cryblend/export.py b/io_export_cryblend/export.py
@@ -439,7 +439,7 @@ def __export_library_geometries(self, parent_element):
         libgeo = self.__doc.createElement("library_geometries")
         parent_element.appendChild(libgeo)
         for object_ in utils.get_type("geometry"):
-            bpy.context.active_object = object_
+            utils.set_active(object_)
             if object_.mode != 'OBJECT':
                 bpy.ops.object.mode_set(mode='OBJECT')
             object_.data.update(calc_tessface=1)

diff --git a/io_export_cryblend/utils.py b/io_export_cryblend/utils.py
@@ -658,7 +658,7 @@ def get_node_name(node):
 
 
 def get_node_type(node):
-    node_components = node.split(".")
+    node_components = node.name.split(".")
     return node_components[-1]
 
 
@@ -686,7 +686,13 @@ def add_fakebones():
     if armature is None:
         return
 
-    skeleton = armature.data
+    try:
+        skeleton = bpy.data.armatures[armature.name]
+    except:
+        raise TypeError(
+            "Armature object name and object data name must " +
+            "be same! You may set it in properties or outliner editor.")
+
     skeleton.pose_position = 'REST'
     time.sleep(0.5)
 
@@ -856,7 +862,7 @@ def apply_animation_scale(armature):
     cbPrint("Baked Animation successfully on empties.")
     deselect_all()
 
-    bpy.context.active_object = armature
+    set_active(armature)
     armature.select = True
     bpy.ops.anim.keyframe_clear_v3d()
 
@@ -977,6 +983,10 @@ def deselect_all():
         object_.select = False
 
 
+def set_active(object_):
+    bpy.context.scene.objects.active = object_
+
+
 def get_object_children(parent):
     return [child for child in parent.children
             if child.type in {'ARMATURE', 'EMPTY', 'MESH'}]