[Bf-blender-cvs] [50fde02] GPencil_Editing_Stage3: Merge branch 'master' into GPencil_Editing_Stage3

[Joshua Leung]

Commit: 50fde02b422a1a1dbc71a7bc95a061e46ce73b33
Author: Joshua Leung
Date:   Sat Dec 12 17:43:00 2015 +1300
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rB50fde02b422a1a1dbc71a7bc95a061e46ce73b33

Merge branch 'master' into GPencil_Editing_Stage3

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

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



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

diff --cc source/blender/editors/transform/transform_manipulator.c
index 8ddd7ae,8131758..0c3f74d
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@@ -1620,15 -1592,12 +1620,12 @@@ void BIF_draw_manipulator(const bContex
  
  		/* now we can define center */
  		switch (v3d->around) {
- 			case V3D_CENTER:
- 			case V3D_ACTIVE:
+ 			case V3D_AROUND_CENTER_BOUNDS:
+ 			case V3D_AROUND_ACTIVE:
  			{
- 				bGPdata *gpd = CTX_data_gpencil_data(C);
- 				Object *ob = OBACT;
- 				
- 				if (((v3d->around == V3D_ACTIVE) && (scene->obedit == NULL)) &&
 -				Object *ob;
+ 				if (((v3d->around == V3D_AROUND_ACTIVE) && (scene->obedit == NULL)) &&
 -				    ((ob = OBACT) && !(ob->mode & OB_MODE_POSE)))
 +				    ((gpd == NULL) || !(gpd->flag & GP_DATA_STROKE_EDITMODE)) &&
 +				    (!(ob->mode & OB_MODE_POSE)))
  				{
  					copy_v3_v3(rv3d->twmat[3], ob->obmat[3]);
  				}