[Bf-blender-cvs] [56da794] soc-2014-shapekey: Cleanup some leftover changes from merge of 'move skey' part in master.

Bastien Montagne noreply at git.blender.org
Thu Oct 30 19:46:18 CET 2014


Commit: 56da7947c9fb3e6453676b937eb0ff8916478b55
Author: Bastien Montagne
Date:   Thu Oct 30 19:31:19 2014 +0100
Branches: soc-2014-shapekey
https://developer.blender.org/rB56da7947c9fb3e6453676b937eb0ff8916478b55

Cleanup some leftover changes from merge of 'move skey' part in master.

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

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 ebb014b..d58548a 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -254,7 +254,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
 
         rows = 2
         if kb:
-            rows = 7
+            rows = 4
         row.template_list("MESH_UL_shape_keys", "", key, "key_blocks", ob, "active_shape_key_index", rows=rows)
 
         col = row.column()
@@ -268,19 +268,19 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
             col.separator()
 
             sub = col.column(align=True)
-            sub.operator("object.shape_key_move", icon='TRIA_UP_BAR', text="").type = 'TOP'
             sub.operator("object.shape_key_move", icon='TRIA_UP', text="").type = 'UP'
             sub.operator("object.shape_key_move", icon='TRIA_DOWN', text="").type = 'DOWN'
-            sub.operator("object.shape_key_move", icon='TRIA_DOWN_BAR', text="").type = 'BOTTOM'
 
             split = layout.split(percentage=0.4)
             row = split.row()
             row.enabled = not is_editmode
             row.prop(key, "use_relative")
+
             row = split.row()
             # if is_editmode:
                 # row.prop(ts, "kb_auto_commit", text = "Auto-commit")
             row.alignment = 'RIGHT'
+
             sub = row.row(align=True)
             sub.label()  # XXX, for alignment only
             subsub = sub.row(align=True)




More information about the Bf-blender-cvs mailing list