[Bf-blender-cvs] [9492d96] soc-2014-shapekey: Merge remote-tracking branch 'origin/master' into soc

[Grigory Revzin]

Commit: 9492d96dc5dd2b823b46beaa15c143eeabbb5646
Author: Grigory Revzin
Date:   Mon May 19 02:40:36 2014 +0400
https://developer.blender.org/rB9492d96dc5dd2b823b46beaa15c143eeabbb5646

Merge remote-tracking branch 'origin/master' into soc

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



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

diff --cc release/scripts/startup/bl_ui/properties_data_mesh.py
index ba89074,41cf93f..bc74c58
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@@ -72,19 -72,9 +72,19 @@@ class MESH_UL_vgroups(UIList)
              layout.label(text="", icon_value=icon)
  
  
 +def draw_shape_value(ob, kb, layout, emboss=False, text=""):
 +    key = ob.data.shape_keys
 +    if (ob.mode == 'EDIT'):
 +        if (key.mix_from_animation):
 +            layout.prop(kb, "value", emboss=emboss, text=text)
 +        else:
 +            layout.prop(kb, "edit_mix_value", emboss=emboss, text='Temp ' + text)
 +    else:
 +        layout.prop(kb, "value", emboss=emboss, text=text)
 +
  class MESH_UL_shape_keys(UIList):
      def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-         # assert(isinstance(item, bpy.types.ShapeKey)
+         # assert(isinstance(item, bpy.types.ShapeKey))
          obj = active_data
          # key = data
          key_block = item
@@@ -92,10 -82,12 +92,12 @@@
              split = layout.split(0.66, False)
              split.prop(key_block, "name", text="", emboss=False, icon_value=icon)
              row = split.row(align=True)
 -            if key_block.mute or (obj.mode == 'EDIT' and not (obj.use_shape_key_edit_mode and obj.type == 'MESH')):
 +            if key_block.mute:
                  row.active = False
 -            if not item.id_data.use_relative:
 -                row.prop(key_block, "frame", text="", emboss=False)
 -            elif index > 0:
 -                row.prop(key_block, "value", text="", emboss=False)
++
 +            if not item.relative_key or index > 0:
 +                draw_shape_value(obj, key_block, row)
++
              else:
                  row.label(text="")
              row.prop(key_block, "mute", text="", emboss=False)