[Bf-blender-cvs] [710b0b6e8eb] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 710b0b6e8ebc6c92e38afcf3a5c4804a2f320ddc
Author: Antonio Vazquez
Date:   Thu May 24 16:49:13 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB710b0b6e8ebc6c92e38afcf3a5c4804a2f320ddc

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/transform/transform_manipulator_3d.c
index 414bf7338e3,b94ccf42325..206e84ac132
--- a/source/blender/editors/transform/transform_manipulator_3d.c
+++ b/source/blender/editors/transform/transform_manipulator_3d.c
@@@ -596,10 -596,10 +596,10 @@@ int ED_transform_calc_manipulator_stats
  	RegionView3D *rv3d = ar->regiondata;
  	Base *base;
  	Object *ob = OBACT(view_layer);
- 	const Object *ob_eval = NULL;
- 	const Object *obedit_eval = NULL;
+ 	Object *ob_eval = NULL;
+ 	Object *obedit_eval = NULL;
  	bGPdata *gpd = CTX_data_gpencil_data(C);
 -	const bool is_gp_edit = ((gpd) && (gpd->flag & GP_DATA_STROKE_EDITMODE));
 +	const bool is_gp_edit = GPENCIL_ANY_MODE(gpd);
  	int a, totsel = 0;
  	const int pivot_point = scene->toolsettings->transform_pivot_point;