From 6597953b256779178300e515515c7cbe21b2c8fe Mon Sep 17 00:00:00 2001
From: QbieShay <cislaghi.ilaria@gmail.com>
Date: Sun, 22 Apr 2018 12:39:15 +0200
Subject: [PATCH] Added exclude option for armature modifier when applying
 modifiers

---
 io_scene_dae/__init__.py   |  6 ++++++
 io_scene_dae/export_dae.py | 22 +++++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/io_scene_dae/__init__.py b/io_scene_dae/__init__.py
index 02dffcf..9f19992 100644
--- a/io_scene_dae/__init__.py
+++ b/io_scene_dae/__init__.py
@@ -74,6 +74,12 @@ class ExportDAE(bpy.types.Operator, ExportHelper):
         description="Apply modifiers to mesh objects (on a copy!).",
         default=False,
         )
+    use_exclude_armature_modifier = BoolProperty(
+        name="Exclude Armature Modifier",
+        description="Exclude the armature modifier when applying modifiers "
+                      "(otherwise animation will be applied on top of the last pose)",
+        default=True,
+        )
     use_tangent_arrays = BoolProperty(
         name="Tangent Arrays",
         description="Export Tangent and Binormal arrays "
diff --git a/io_scene_dae/export_dae.py b/io_scene_dae/export_dae.py
index d608f97..ba87922 100644
--- a/io_scene_dae/export_dae.py
+++ b/io_scene_dae/export_dae.py
@@ -511,6 +511,21 @@ class DaeExporter:
             self.mesh_cache[node.data] = meshdata
             return meshdata
 
+
+        armature_modifier = None
+
+        armature_poses = None
+
+        if(self.config["use_exclude_armature_modifier"]):
+            armature_modifier = node.modifiers.get("Armature")
+        
+        if(armature_modifier):
+        	#doing this per object is inefficient, should be improved, maybe?
+            armature_poses = [arm.pose_position for arm in bpy.data.armatures]
+            for arm in bpy.data.armatures:
+                arm.pose_position = "REST"
+
+
         apply_modifiers = len(node.modifiers) and self.config[
             "use_mesh_modifiers"]
 
@@ -520,8 +535,13 @@ class DaeExporter:
 
         mesh = node.to_mesh(self.scene, apply_modifiers,
                             "RENDER")  # TODO: Review
-        self.temp_meshes.add(mesh)
+        if(armature_modifier):
+            for i,arm in enumerate(bpy.data.armatures):
+                arm.pose_position = armature_poses[i]
 
+
+
+        self.temp_meshes.add(mesh)
         triangulate = self.config["use_triangles"]
         if (triangulate):
             bm = bmesh.new()