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

[Antonio Vazquez]

Commit: 1beeff419ef801b6e586966ddaf3a90ea9924e0a
Author: Antonio Vazquez
Date:   Fri Jun 8 17:50:59 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1beeff419ef801b6e586966ddaf3a90ea9924e0a

Merge branch 'blender2.8' into greasepencil-object

	source/blender/editors/gpencil/gpencil_edit.c
	source/blender/editors/gpencil/gpencil_paint.c
	source/blender/editors/gpencil/gpencil_utils.c
	source/blender/editors/space_view3d/view3d_ruler.c

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



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

diff --cc source/blender/editors/gpencil/gpencil_edit.c
index 50b5190d0df,45caadf3742..1889ead084c
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@@ -55,18 -54,12 +55,19 @@@
  #include "DNA_view3d_types.h"
  #include "DNA_gpencil_types.h"
  
 +#include "BKE_main.h"
  #include "BKE_context.h"
 +#include "BKE_global.h"
 +#include "BKE_brush.h"
  #include "BKE_gpencil.h"
 +#include "BKE_paint.h"
  #include "BKE_library.h"
+ #include "BKE_main.h"
 +#include "BKE_material.h"
 +#include "BKE_object.h"
  #include "BKE_report.h"
  #include "BKE_screen.h"
 +#include "BKE_workspace.h"
  
  #include "UI_interface.h"
  #include "UI_resources.h"
diff --cc source/blender/editors/gpencil/gpencil_paint.c
index 125c310d4b4,437d5cef6f8..ae5a4f40d25
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -46,28 -46,22 +46,30 @@@
  
  #include "PIL_time.h"
  
+ #include "BKE_colortools.h"
 +#include "DNA_meshdata_types.h"
 +#include "DNA_object_types.h"
 +#include "DNA_scene_types.h"
 +#include "DNA_gpencil_types.h"
 +#include "DNA_material_types.h"
 +#include "DNA_brush_types.h"
 +#include "DNA_windowmanager_types.h"
 +
 +#include "BKE_main.h"
 +#include "BKE_brush.h"
 +#include "BKE_paint.h"
 +#include "BKE_gpencil.h"
  #include "BKE_context.h"
  #include "BKE_global.h"
+ #include "BKE_gpencil.h"
+ #include "BKE_main.h"
+ #include "BKE_paint.h"
  #include "BKE_report.h"
 +#include "BKE_layer.h"
 +#include "BKE_material.h"
  #include "BKE_screen.h"
  #include "BKE_tracking.h"
- #include "BKE_colortools.h"
- #include "BKE_workspace.h"
  
 -#include "DNA_object_types.h"
 -#include "DNA_scene_types.h"
 -#include "DNA_gpencil_types.h"
 -#include "DNA_brush_types.h"
 -#include "DNA_windowmanager_types.h"
 -
  #include "UI_view2d.h"
  
  #include "ED_gpencil.h"
diff --cc source/blender/editors/gpencil/gpencil_utils.c
index 9516ae2daa3,f6d72d9e575..51db1b0858c
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@@ -49,16 -47,11 +49,15 @@@
  #include "DNA_space_types.h"
  #include "DNA_view3d_types.h"
  
+ #include "BKE_action.h"
 +#include "BKE_main.h"
 +#include "BKE_brush.h"
  #include "BKE_context.h"
  #include "BKE_gpencil.h"
 -#include "BKE_main.h"
 +#include "BKE_object.h"
 +#include "BKE_paint.h"
 +#include "BKE_material.h"
  #include "BKE_tracking.h"
- #include "BKE_action.h"
- #include "BKE_screen.h"
  
  #include "WM_api.h"
  
diff --cc source/blender/editors/space_view3d/view3d_manipulator_ruler.c
index 48e417d8afd,cd918695f60..85ea17213f0
--- a/source/blender/editors/space_view3d/view3d_manipulator_ruler.c
+++ b/source/blender/editors/space_view3d/view3d_manipulator_ruler.c
@@@ -31,13 -31,12 +31,15 @@@
  #include "BLT_translation.h"
  
  #include "BKE_context.h"
- #include "BKE_object.h"
  #include "BKE_gpencil.h"
+ #include "BKE_main.h"
+ 
+ #include "BKE_object.h"
  #include "BKE_unit.h"
 +#include "BKE_material.h"
 +#include "BKE_main.h"
  
 +#include "DNA_meshdata_types.h"
  #include "DNA_object_types.h"
  #include "DNA_gpencil_types.h"
  #include "DNA_view3d_types.h"