[Bf-extensions-cvs] [815c1eab] master: FBX: Fix ShapeKeys not being exported anymore for rigged meshes.

[Bastien Montagne]

Commit: 815c1eab95b05dea209fb16866ad93ce6504179f
Author: Bastien Montagne
Date:   Wed May 29 11:41:49 2019 +0200
Branches: master
https://developer.blender.org/rBA815c1eab95b05dea209fb16866ad93ce6504179f

FBX: Fix ShapeKeys not being exported anymore for rigged meshes.

Not sure when that mistake was introduced, Armature modifier is not
considered a 'real' modifier to be baked, from FBX exporter point of
view...

Reported/followup from T64994.

===================================================================

M	io_scene_fbx/__init__.py
M	io_scene_fbx/export_fbx_bin.py

===================================================================

diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py
index 5d95db6d..fb0c4213 100644
--- a/io_scene_fbx/__init__.py
+++ b/io_scene_fbx/__init__.py
@@ -21,7 +21,7 @@
 bl_info = {
     "name": "FBX format",
     "author": "Campbell Barton, Bastien Montagne, Jens Restemeier",
-    "version": (4, 14, 12),
+    "version": (4, 14, 13),
     "blender": (2, 80, 0),
     "location": "File > Import-Export",
     "description": "FBX IO meshes, UV's, vertex colors, materials, textures, cameras, lamps and actions",
diff --git a/io_scene_fbx/export_fbx_bin.py b/io_scene_fbx/export_fbx_bin.py
index c8790ada..762fb5b9 100644
--- a/io_scene_fbx/export_fbx_bin.py
+++ b/io_scene_fbx/export_fbx_bin.py
@@ -2220,7 +2220,7 @@ def fbx_data_from_scene(scene, depsgraph, settings):
                             armature = object.data
                             backup_pose_positions.append((armature, armature.pose_position))
                             armature.pose_position = 'REST'
-                    if mod.show_render or mod.show_viewport:
+                    elif mod.show_render or mod.show_viewport:
                         use_org_data = False
             if not use_org_data:
                 # If modifiers has been altered need to update dependency graph.