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.

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];