[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40753] trunk/blender/source/blender/ editors/transform: fix [#28788] Scale using "Individual origins" in bones
Campbell Barton
ideasman42 at gmail.com
Sun Oct 2 21:57:35 CEST 2011
Revision: 40753
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40753
Author: campbellbarton
Date: 2011-10-02 19:57:34 +0000 (Sun, 02 Oct 2011)
Log Message:
-----------
fix [#28788] Scale using "Individual origins" in bones
works for rotate and scale
Modified Paths:
--------------
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2011-10-02 18:09:36 UTC (rev 40752)
+++ trunk/blender/source/blender/editors/transform/transform.c 2011-10-02 19:57:34 UTC (rev 40753)
@@ -2612,7 +2612,9 @@
}
else if (t->flag & T_EDIT) {
- if(t->settings->selectmode & SCE_SELECT_FACE) {
+ if( (t->settings->selectmode & SCE_SELECT_FACE) ||
+ (t->obedit && t->obedit->type == OB_ARMATURE))
+ {
copy_v3_v3(center, td->center);
}
else {
@@ -2902,12 +2904,12 @@
/* local constraint shouldn't alter center */
if (around == V3D_LOCAL) {
- if (t->flag & (T_OBJECT|T_POSE)) {
+ if ( (t->flag & (T_OBJECT|T_POSE)) ||
+ (t->settings->selectmode & SCE_SELECT_FACE) ||
+ (t->obedit && t->obedit->type == OB_ARMATURE))
+ {
center = td->center;
}
- else if (t->settings->selectmode & SCE_SELECT_FACE) {
- center = td->center;
- }
}
if (t->flag & T_POINTS) {
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2011-10-02 18:09:36 UTC (rev 40752)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2011-10-02 19:57:34 UTC (rev 40753)
@@ -1194,7 +1194,7 @@
if (ebo->flag & BONE_TIPSEL)
{
copy_v3_v3(td->iloc, ebo->tail);
- copy_v3_v3(td->center, td->iloc);
+ copy_v3_v3(td->center, (t->around==V3D_LOCAL) ? ebo->head : td->iloc);
td->loc= ebo->tail;
td->flag= TD_SELECTED;
if (ebo->flag & BONE_EDITMODE_LOCKED)
More information about the Bf-blender-cvs
mailing list