[Bf-blender-cvs] [1aa7698662a] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: 1aa7698662a4e03472eee57311561e13c614cf72
Author: Antonio Vazquez
Date:   Tue Jun 16 19:27:55 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB1aa7698662a4e03472eee57311561e13c614cf72

Merge branch 'master' into greasepencil-edit-curve

 Conflicts:
	source/blender/blenkernel/intern/gpencil_geom.c

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



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

diff --cc source/blender/blenkernel/intern/gpencil_geom.c
index f8937466eed,a67c36ea713..63e400f6c2b
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@@ -35,14 -36,18 +36,18 @@@
  #include "BLI_math_vector.h"
  #include "BLI_polyfill_2d.h"
  
 -#include "BLT_translation.h"
 -
 +#include "DNA_gpencil_modifier_types.h"
  #include "DNA_gpencil_types.h"
+ #include "DNA_mesh_types.h"
  #include "DNA_meshdata_types.h"
+ #include "DNA_scene_types.h"
  
  #include "BKE_deform.h"
  #include "BKE_gpencil.h"
 +#include "BKE_gpencil_curve.h"
  #include "BKE_gpencil_geom.h"
+ #include "BKE_main.h"
+ #include "BKE_material.h"
  #include "BKE_object.h"
  
  #include "DEG_depsgraph_query.h"