[Bf-blender-cvs] [ba3a784] soc-2014-shapekey: Correction to the last merge

[Grigory Revzin]

Commit: ba3a78472adf2c4d18349fe2f6b4d9f6b9bf5ac4
Author: Grigory Revzin
Date:   Mon May 19 08:57:32 2014 +0400
https://developer.blender.org/rBba3a78472adf2c4d18349fe2f6b4d9f6b9bf5ac4

Correction to the last merge

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

M	release/scripts/startup/bl_ui/properties_data_mesh.py

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

diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index bc74c58..848876b 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -95,9 +95,10 @@ class MESH_UL_shape_keys(UIList):
             if key_block.mute:
                 row.active = False
 
-            if not item.relative_key or index > 0:
+            if not item.id_data.use_relative:
+				row.prop(key_block, "frame", text="", emboss=False)
+			elif index > 0:
                 draw_shape_value(obj, key_block, row)
-
             else:
                 row.label(text="")
             row.prop(key_block, "mute", text="", emboss=False)