[Bf-blender-cvs] [6a37a83fc05] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: 6a37a83fc05b0dce1746a70da2ed58cbbea8d85c
Author: Antonio Vazquez
Date:   Mon Feb 10 15:43:57 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB6a37a83fc05b0dce1746a70da2ed58cbbea8d85c

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/blenkernel/intern/gpencil.c
	source/blender/editors/sculpt_paint/paint_ops.c

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



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

diff --cc source/blender/blenkernel/intern/gpencil.c
index 8612973fd11,e3d6e73e8c9..8da97db5761
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@@ -59,8 -55,7 +59,8 @@@
  #include "BKE_deform.h"
  #include "BKE_gpencil.h"
  #include "BKE_icons.h"
 +#include "BKE_image.h"
- #include "BKE_library.h"
+ #include "BKE_lib_id.h"
  #include "BKE_main.h"
  #include "BKE_material.h"
  #include "BKE_object.h"
diff --cc source/blender/blenloader/intern/versioning_280.c
index 78f2b87de24,cb12efd0ec2..fb475b3e0b1
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -72,10 -71,9 +72,10 @@@
  #include "BKE_fcurve.h"
  #include "BKE_freestyle.h"
  #include "BKE_global.h"
 +#include "BKE_gpencil.h"
  #include "BKE_idprop.h"
  #include "BKE_key.h"
- #include "BKE_library.h"
+ #include "BKE_lib_id.h"
  #include "BKE_layer.h"
  #include "BKE_main.h"
  #include "BKE_mesh.h"
diff --cc source/blender/blenloader/intern/versioning_defaults.c
index 8dc71dd314e,446cfa4163f..c03c5a7b335
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@@ -44,12 -44,10 +44,12 @@@
  #include "BKE_appdir.h"
  #include "BKE_brush.h"
  #include "BKE_colortools.h"
 +#include "BKE_gpencil.h"
  #include "BKE_layer.h"
- #include "BKE_library.h"
+ #include "BKE_lib_id.h"
  #include "BKE_main.h"
  #include "BKE_mesh.h"
 +#include "BKE_material.h"
  #include "BKE_node.h"
  #include "BKE_paint.h"
  #include "BKE_screen.h"
diff --cc source/blender/editors/sculpt_paint/paint_ops.c
index 68d26cc5c74,8c8fc412663..689dfd97ae0
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@@ -36,11 -33,9 +36,11 @@@
  
  #include "BKE_brush.h"
  #include "BKE_context.h"
 +#include "BKE_image.h"
- #include "BKE_library.h"
+ #include "BKE_lib_id.h"
  #include "BKE_main.h"
  #include "BKE_paint.h"
 +#include "BKE_report.h"
  
  #include "ED_paint.h"
  #include "ED_screen.h"