diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-03 20:20:05 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-03 20:20:05 +0400 |
commit | e5a11dfcd670f45a467a84b362c7d189cd011fab (patch) | |
tree | 3c1716eaf4862bfc402ccc8286187830aed564cd /source | |
parent | 782499717efa2464b700360ded6193a67a170781 (diff) |
fix for [#28788] wasn't complete, pose bones scale was ignoring "Individual origins" setting.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/transform/transform.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 898785fd120..73acd1f9000 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -2606,29 +2606,18 @@ static void ElementResize(TransInfo *t, TransData *td, float mat[3][3]) { } /* local constraint shouldn't alter center */ - if (t->around == V3D_LOCAL) { - if (t->flag & T_OBJECT) { - copy_v3_v3(center, td->center); - } - else if (t->flag & T_EDIT) { - - if( (t->settings->selectmode & SCE_SELECT_FACE) || - (t->obedit && t->obedit->type == OB_ARMATURE)) - { - copy_v3_v3(center, td->center); - } - else { - copy_v3_v3(center, t->center); - } - } - else { - copy_v3_v3(center, t->center); - } + if ((t->around == V3D_LOCAL) && + ( (t->flag & (T_OBJECT|T_POSE)) || + ((t->flag & T_EDIT) && (t->settings->selectmode & SCE_SELECT_FACE)) || + (t->obedit && t->obedit->type == OB_ARMATURE)) + ) + { + copy_v3_v3(center, td->center); } else { copy_v3_v3(center, t->center); } - + if (td->ext) { float fsize[3]; |