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

[Antonio Vazquez]

Commit: 6619fcc22d681f8744ad3b59e7cf3fff6cd0987d
Author: Antonio Vazquez
Date:   Tue Jun 5 14:01:03 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6619fcc22d681f8744ad3b59e7cf3fff6cd0987d

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index ff941b86ff9,f73df9ab844..386795b40dc
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -70,10 -67,8 +70,11 @@@
  #include "BKE_report.h"
  #include "BKE_scene.h"
  #include "BKE_screen.h"
+ #include "BKE_studiolight.h"
  #include "BKE_workspace.h"
 +#include "BKE_gpencil.h"
 +#include "BKE_paint.h"
 +#include "BKE_object.h"
  
  #include "BLO_readfile.h"
  #include "readfile.h"
diff --cc source/blender/editors/transform/transform_manipulator_3d.c
index 206e84ac132,d5fc3fa3ad7..523a6bb1548
--- a/source/blender/editors/transform/transform_manipulator_3d.c
+++ b/source/blender/editors/transform/transform_manipulator_3d.c
@@@ -596,10 -595,8 +595,8 @@@ int ED_transform_calc_manipulator_stats
  	RegionView3D *rv3d = ar->regiondata;
  	Base *base;
  	Object *ob = OBACT(view_layer);
- 	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;