Revision: 24240
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24240
Author: billrey
Date: 2009-11-02 14:20:14 +0100 (Mon, 02 Nov 2009)
Log Message:
-----------
*Added subdivide to armature toolbar, and gave it a hotkey (W)
*Fixed some remaining icon issue in the shape key properties
Modified Paths:
--------------
trunk/blender/release/scripts/ui/properties_data_mesh.py
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
trunk/blender/source/blender/editors/armature/armature_ops.c
Modified: trunk/blender/release/scripts/ui/properties_data_mesh.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_mesh.py 2009-11-02
11:37:35 UTC (rev 24239)
+++ trunk/blender/release/scripts/ui/properties_data_mesh.py 2009-11-02
13:20:14 UTC (rev 24240)
@@ -180,8 +180,14 @@
subrow = sub.row(align=True)
subrow.active = enable_edit_value
- subrow.itemR(ob, "shape_key_lock", icon='ICON_UNPINNED', text="")
- subrow.itemR(kb, "mute", icon='ICON_MUTE_IPO_OFF', text="")
+ if ob.shape_key_lock:
+ subrow.itemR(ob, "shape_key_lock", icon='ICON_PINNED', text="")
+ else:
+ subrow.itemR(ob, "shape_key_lock", icon='ICON_UNPINNED',
text="")
+ if kb.mute:
+ subrow.itemR(kb, "mute", icon='ICON_MUTE_IPO_ON', text="")
+ else:
+ subrow.itemR(kb, "mute", icon='ICON_MUTE_IPO_OFF', text="")
subrow.itemO("object.shape_key_clear", icon='ICON_X', text="")
sub.itemO("object.shape_key_mirror", icon='ICON_MOD_MIRROR',
text="")
Modified: trunk/blender/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2009-11-02
11:37:35 UTC (rev 24239)
+++ trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2009-11-02
13:20:14 UTC (rev 24240)
@@ -278,6 +278,7 @@
col = layout.column(align=True)
col.itemL(text="Modeling:")
col.itemO("armature.extrude_move")
+ col.itemO("armature.subdivide_multi", text="Subdivide")
col = layout.column(align=True)
col.itemL(text="Grease Pencil:")
Modified: trunk/blender/source/blender/editors/armature/armature_ops.c
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_ops.c
2009-11-02 11:37:35 UTC (rev 24239)
+++ trunk/blender/source/blender/editors/armature/armature_ops.c
2009-11-02 13:20:14 UTC (rev 24240)
@@ -209,7 +209,7 @@
WM_keymap_add_item(keymap, "ARMATURE_OT_bone_primitive_add", AKEY,
KM_PRESS, KM_SHIFT, 0);
/* only the menu-version of subdivide is registered in keymaps
for now */
- WM_keymap_add_item(keymap, "ARMATURE_OT_subdivs", SKEY, KM_PRESS,
KM_ALT, 0);
+ WM_keymap_add_item(keymap, "ARMATURE_OT_subdivide_multi", WKEY,
KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "ARMATURE_OT_parent_set", PKEY, KM_PRESS,
KM_CTRL, 0);
WM_keymap_add_item(keymap, "ARMATURE_OT_parent_clear", PKEY, KM_PRESS,
KM_ALT, 0);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
