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

[Campbell Barton]

Commit: e1fa97f31886d6fe1b6e8e31d2fb7fc38a439cfa
Author: Campbell Barton
Date:   Fri Mar 31 20:05:20 2017 +1100
Branches: custom-manipulators
https://developer.blender.org/rBe1fa97f31886d6fe1b6e8e31d2fb7fc38a439cfa

Merge branch 'blender2.8' into custom-manipulators

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



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

diff --cc source/blender/editors/transform/transform_manipulator.c
index 8572813aa06,489badf594b..a459b3a071b
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@@ -847,11 -524,10 +847,10 @@@ static int calc_manipulator_stats(cons
  	}
  	else if (ob && (ob->mode & OB_MODE_POSE)) {
  		bPoseChannel *pchan;
 -		int mode = TFM_ROTATION; // mislead counting bones... bah. We don't know the manipulator mode, could be mixed
 +		int mode = TFM_ROTATION; /* mislead counting bones... bah. We don't know the manipulator mode, could be mixed */
  		bool ok = false;
  
- 		if ((ob->lay & v3d->lay) == 0)
- 			return 0;
+ 		if ((ob->lay & v3d->lay) == 0) return 0;
  
  		if ((v3d->around == V3D_AROUND_ACTIVE) && (pchan = BKE_pose_channel_active(ob))) {
  			/* doesn't check selection or visibility intentionally */
@@@ -887,7 -563,32 +886,8 @@@
  	else if (ob && (ob->mode & OB_MODE_ALL_PAINT)) {
  		/* pass */
  	}
 -	else if (ob && ob->mode & OB_MODE_PARTICLE_EDIT) {
 -		PTCacheEdit *edit = PE_get_current(scene, sl, ob);
 -		PTCacheEditPoint *point;
 -		PTCacheEditKey *ek;
 -		int k;
 -
 -		if (edit) {
 -			point = edit->points;
 -			for (a = 0; a < edit->totpoint; a++, point++) {
 -				if (point->flag & PEP_HIDE) continue;
 -
 -				for (k = 0, ek = point->keys; k < point->totkey; k++, ek++) {
 -					if (ek->flag & PEK_SELECT) {
 -						calc_tw_center(scene, (ek->flag & PEK_USE_WCO) ? ek->world_co : ek->co);
 -						totsel++;
 -					}
 -				}
 -			}
 -
 -			/* selection center */
 -			if (totsel)
 -				mul_v3_fl(scene->twcent, 1.0f / (float)totsel);  // centroid!
 -		}
 -	}
  	else {
+ 
  		/* we need the one selected object, if its not active */
  		base = BASACT_NEW;
  		ob = OBACT_NEW;