[Bf-blender-cvs] [0f06bef] wiggly-widgets: Merge branch 'master' into wiggly-widgets

[Julian Eisel]

Commit: 0f06bef71307a3f5d6b25c5241fcbad7d15b3f5b
Author: Julian Eisel
Date:   Fri Sep 11 01:38:08 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB0f06bef71307a3f5d6b25c5241fcbad7d15b3f5b

Merge branch 'master' into wiggly-widgets

Conflicts:
	source/blender/editors/transform/transform_manipulator.c

===================================================================



===================================================================

diff --cc source/blender/editors/transform/transform_manipulator.c
index 309c538,374a0c3..be0e67c
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@@ -883,9 -563,12 +883,9 @@@ static int calc_manipulator_stats(cons
  				}
  				/* if not gimbal, fall through to normal */
  				/* fall-through */
 -			}
  			case V3D_MANIP_NORMAL:
 -			{
  				if (obedit || ob->mode & OB_MODE_POSE) {
- 					ED_getTransformOrientationMatrix(C, mat, (v3d->around == V3D_ACTIVE));
 -					float mat[3][3];
+ 					ED_getTransformOrientationMatrix(C, mat, v3d->around);
  					copy_m4_m3(rv3d->twmat, mat);
  					break;
  				}
@@@ -897,7 -582,8 +897,7 @@@
  					 * use the active pones axis for display [#33575], this works as expected on a single bone
  					 * and users who select many bones will understand whats going on and what local means
  					 * when they start transforming */
- 					ED_getTransformOrientationMatrix(C, mat, (v3d->around == V3D_ACTIVE));
 -					float mat[3][3];
+ 					ED_getTransformOrientationMatrix(C, mat, v3d->around);
  					copy_m4_m3(rv3d->twmat, mat);
  					break;
  				}
@@@ -909,8 -598,11 +909,8 @@@
  				normalize_m3(mat);
  				copy_m4_m3(rv3d->twmat, mat);
  				break;
 -			}
  			default: /* V3D_MANIP_CUSTOM */
- 				if (applyTransformOrientation(C, mat, NULL)) {
 -			{
 -				float mat[3][3];
+ 				if (applyTransformOrientation(C, mat, NULL, v3d->twmode - V3D_MANIP_CUSTOM)) {
  					copy_m4_m3(rv3d->twmat, mat);
  				}
  				break;