[Bf-blender-cvs] [7b397cdfc81] blender-v2.79-release: Fix T52401: "Export Keying Set" operator generated incorrect ID's for shapekeys

[Joshua Leung]

Commit: 7b397cdfc8109abde3175b88400131dda5782448
Author: Joshua Leung
Date:   Fri Aug 18 01:03:28 2017 +1200
Branches: blender-v2.79-release
https://developer.blender.org/rB7b397cdfc8109abde3175b88400131dda5782448

Fix T52401: "Export Keying Set" operator generated incorrect ID's for shapekeys

To be backported.

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

M	release/scripts/startup/bl_operators/anim.py

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

diff --git a/release/scripts/startup/bl_operators/anim.py b/release/scripts/startup/bl_operators/anim.py
index 02fb05e29eb..a843c17217a 100644
--- a/release/scripts/startup/bl_operators/anim.py
+++ b/release/scripts/startup/bl_operators/anim.py
@@ -137,6 +137,9 @@ class ANIM_OT_keying_set_export(Operator):
                         break
                 else:
                     self.report({'WARN'}, "Could not find scene using Compositor Node Tree - %s" % (ksp.id))
+            elif ksp.id.bl_rna.name == "Key":
+                # "keys" conflicts with a Python keyword, hence the simple solution won't work
+                id_bpy_path = "bpy.data.shape_keys[\"%s\"]" % (ksp.id.name)
             else:
                 idtype_list = ksp.id.bl_rna.name.lower() + "s"
                 id_bpy_path = "bpy.data.%s[\"%s\"]" % (idtype_list, ksp.id.name)