diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 11 | ||||
| -rw-r--r-- | source/blender/editors/armature/armature_ops.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 8 |
3 files changed, 10 insertions, 14 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 1fed424f463..0844bff8352 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -251,11 +251,12 @@ class VIEW3D_MT_transform_armature(VIEW3D_MT_transform_base): layout.separator() obj = context.object - if (obj.type == 'ARMATURE' and obj.mode in {'EDIT', 'POSE'} and - obj.data.draw_type in {'BBONE', 'ENVELOPE'} - ): - - layout.operator("transform.transform", text="Scale Envelope/BBone").mode = 'BONE_SIZE' + if obj.type == 'ARMATURE' and obj.mode in {'EDIT', 'POSE'}: + if obj.data.draw_type == 'BBONE': + layout.operator("transform.transform", text="Scale BBone").mode = 'BONE_SIZE' + elif obj.data.draw_type == 'ENVELOPE': + layout.operator("transform.transform", text="Scale Envelope Distance").mode = 'BONE_SIZE' + layout.operator("transform.transform", text="Scale Radius").mode = 'BONE_ENVELOPE' if context.edit_object and context.edit_object.type == 'ARMATURE': layout.operator("armature.align") diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c index feb9b0f939a..be23c285cf7 100644 --- a/source/blender/editors/armature/armature_ops.c +++ b/source/blender/editors/armature/armature_ops.c @@ -294,7 +294,10 @@ void ED_keymap_armature(wmKeyConfig *keyconf) /* 1) envelope/b-bone size */ kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", SKEY, KM_PRESS, KM_CTRL | KM_ALT, 0); RNA_enum_set(kmi->ptr, "mode", TFM_BONESIZE); - /* 2) set roll */ + /* 2) envelope radius */ + kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", SKEY, KM_PRESS, KM_ALT, 0); + RNA_enum_set(kmi->ptr, "mode", TFM_BONE_ENVELOPE); + /* 3) set roll */ kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", RKEY, KM_PRESS, KM_CTRL, 0); RNA_enum_set(kmi->ptr, "mode", TFM_BONE_ROLL); diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index c9aac314caf..2c001ca6527 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1072,14 +1072,6 @@ static void createTransArmatureVerts(TransInfo *t) TransData *td; float mtx[3][3], smtx[3][3], bonemat[3][3]; - /* special hack for envelope drawmode and scaling: - * to allow scaling the size of the envelope around single points, - * mode should become TFM_BONE_ENVELOPE in this case - */ - // TODO: maybe we need a separate hotkey for it, but this is consistent with 2.4x for now - if ((t->mode == TFM_RESIZE) && (arm->drawtype == ARM_ENVELOPE)) - t->mode = TFM_BONE_ENVELOPE; - t->total = 0; for (ebo = edbo->first; ebo; ebo = ebo->next) { if (EBONE_VISIBLE(arm, ebo) && !(ebo->flag & BONE_EDITMODE_LOCKED)) { |