blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Fix T38077: Scaling bones in EditMode drawn using envelope display mode scales joint radii instead 

When trying to scale bones in EditMode and the bones were drawn using envelope display mode,
this resulted in the joint radii (i.e. the inner part of envelopes) being adjusted instead.
It turns out that this was due to an old hack that was put in place back in 2.4x (see the
tracker logs for full details of the problem here).

This commit introduces the following fixes:
1) Removed the old hack. Scaling (S) works normally now.
2) Ctrl-Alt-S (i.e. "Scale Envelopes/BBones") is as-is.
   That is, it is used to adjust the size falloff-region around a bone
   (i.e. the "dist" property)
3) Added Alt-S hotkey in EditMode for armatures for adjusting the radii of bones.
   This change just means that the "TFM_BONE_ENVELOPE" mode is now able to be
   accessed from the UI as a tool on its own right (instead of being accessible
   via the old undocumented hack). This tool adjusts the radii of the bone joints,
   which define the actual full-influence region of the envelopes.
This commit is contained in:
Joshua Leung 2014-01-10 00:44:03 +13:00
parent da6bc87b57
commit 0445454f1e
Notes: blender-bot 2023-02-14 11:23:56 +01:00 
Referenced by issue #38141, OSX Retina: Add Reroute node wrong placement
Referenced by issue #38142, Node Group defaults not working
Referenced by issue #38130, Cannot copy rotation channel values to other transform channel values
Referenced by issue #38077, Armature, scaling difference between octrahedal and envelope display modes.
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -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")

5
source/blender/editors/armature/armature_ops.c
View File

@ -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);

8
source/blender/editors/transform/transform_conversions.c
View File

@ -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)) {