diff options
author | Ton Roosendaal <ton@blender.org> | 2006-08-11 13:20:52 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-08-11 13:20:52 +0400 |
commit | 0c571a4d5c05c4dca8c464c6c8171715d9b30c50 (patch) | |
tree | 6f969e76145be5f7b809f8f89f2aebcf127d65a4 /source | |
parent | 342671308ccc7acc024dbe2bcee5c129955bfd4a (diff) |
Bugfix 4865
Manipulator orientation tweak: when having multiple objects selected, the
orientation option "Local" was always skipped, showing it global. Now it
uses the orientation of the active object.
The bug reportor noticed a conflict with the "Around" option "Active". In
that case he expected the orientation to be from Active Object as well.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/src/transform_manipulator.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/src/transform_manipulator.c b/source/blender/src/transform_manipulator.c index 406237936db..df30434da6c 100644 --- a/source/blender/src/transform_manipulator.c +++ b/source/blender/src/transform_manipulator.c @@ -485,12 +485,11 @@ int calc_manipulator_stats(ScrArea *sa) } /* no break we define 'normal' as 'local' in Object mode */ case V3D_MANIP_LOCAL: - if(totsel==1 || v3d->around==V3D_LOCAL || G.obedit || (ob->flag & OB_POSEMODE)) { - strcpy(t->spacename, "local"); - Mat4CpyMat4(v3d->twmat, ob->obmat); - Mat4Ortho(v3d->twmat); - } + strcpy(t->spacename, "local"); + Mat4CpyMat4(v3d->twmat, ob->obmat); + Mat4Ortho(v3d->twmat); break; + case V3D_MANIP_VIEW: { float mat[3][3]; |