diff options
| author | Martin Poirier <theeth@yahoo.com> | 2009-03-13 21:04:38 +0300 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2009-03-13 21:04:38 +0300 |
| commit | 54a55827ecee7f25d6a52255d8a639498a678fa6 (patch) | |
| tree | 6311657bfab7e75fa59e6828e0381bdcd4ec9eda /source/blender/src/transform_conversions.c | |
| parent | dff781c2a8c77f35fefe00b0a561235861d4d053 (diff) | |
| parent | 39acb4efa4c3f35806f5dc37124ff1028eb18215 (diff) | |
merging trunk 19093:19274etch-a-ton
Diffstat (limited to 'source/blender/src/transform_conversions.c')
| -rw-r--r-- | source/blender/src/transform_conversions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c index dadeb71f73e..76f315cde04 100644 --- a/source/blender/src/transform_conversions.c +++ b/source/blender/src/transform_conversions.c @@ -646,7 +646,7 @@ static void bone_children_clear_transflag(TransInfo *t, ListBase *lb) { bone->flag |= BONE_HINGE_CHILD_TRANSFORM; } - else if (bone->flag & BONE_TRANSFORM && (t->mode == TFM_ROTATION || t->mode == TFM_TRACKBALL)) + else if (bone->flag & BONE_TRANSFORM && (t->mode == TFM_ROTATION || t->mode == TFM_TRACKBALL) && t->around == V3D_LOCAL) { bone->flag |= BONE_TRANSFORM_CHILD; } @@ -3531,7 +3531,7 @@ static void set_trans_object_base_flags(TransInfo *t) if(parsel) { - if (t->mode == TFM_ROTATION || t->mode == TFM_TRACKBALL) + if ((t->mode == TFM_ROTATION || t->mode == TFM_TRACKBALL) && t->around == V3D_LOCAL) { base->flag |= BA_TRANSFORM_CHILD; } |