[Bf-blender-cvs] [e34540a6748] custom-manipulators: Merge branch 'blender2.8' into custom-manipulators

[Campbell Barton]

Commit: e34540a6748ae462c0cb31f0bd646af7015abe92
Author: Campbell Barton
Date:   Thu Apr 6 12:13:47 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rBe34540a6748ae462c0cb31f0bd646af7015abe92

Merge branch 'blender2.8' into custom-manipulators

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



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

diff --cc source/blender/editors/transform/transform_manipulator.c
index c5bbf356414,eead20eac33..960d80762bd
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@@ -478,16 -145,9 +478,15 @@@ static void protectflag_to_drawflags(sh
  }
  
  /* for pose mode */
- static void stats_pose(Scene *scene, Object *ob, bPoseChannel *pchan)
 -static void stats_pchan(RegionView3D *rv3d, bPoseChannel *pchan)
++static void stats_pchan(Scene *scene, Object *ob, RegionView3D *rv3d, bPoseChannel *pchan)
  {
 -	protectflag_to_drawflags(pchan->protectflag, &rv3d->twdrawflag);
 +	Bone *bone = pchan->bone;
- 
 +	if (bone) {
 +		/* update pose matrix after transform */
 +		BKE_pose_where_is(scene, ob);
 +
- 		calc_tw_center(scene, pchan->pose_head);
++		protectflag_to_drawflags(pchan->protectflag, &rv3d->twdrawflag);
 +	}
  }
  
  /* for editmode*/
@@@ -864,7 -527,8 +866,8 @@@ static int calc_manipulator_stats(cons
  			/* doesn't check selection or visibility intentionally */
  			Bone *bone = pchan->bone;
  			if (bone) {
- 				stats_pose(scene, ob, pchan);
+ 				calc_tw_center(scene, pchan->pose_head);
 -				stats_pchan(rv3d, pchan);
++				stats_pchan(scene, ob, rv3d, pchan);
  				totsel = 1;
  				ok = true;
  			}
@@@ -877,7 -541,8 +880,8 @@@
  				for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
  					Bone *bone = pchan->bone;
  					if (bone && (bone->flag & BONE_TRANSFORM)) {
- 						stats_pose(scene, ob, pchan);
+ 						calc_tw_center(scene, pchan->pose_head);
 -						stats_pchan(rv3d, pchan);
++						stats_pchan(scene, ob, rv3d, pchan);
  					}
  				}
  				ok = true;