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

[Antonio Vazquez]

Commit: bbdfa2a434fe971b9a3a59bc039241041c381aec
Author: Antonio Vazquez
Date:   Fri Nov 13 21:54:16 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBbbdfa2a434fe971b9a3a59bc039241041c381aec

Merge branch 'master' into greasepencil-object

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

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



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

diff --cc source/blender/blenkernel/intern/gpencil_geom.c
index a299c53ac24,d2cfb36cb15..6471a3c32d9
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@@ -44,11 -44,12 +44,14 @@@
  #include "DNA_mesh_types.h"
  #include "DNA_meshdata_types.h"
  #include "DNA_scene_types.h"
 +#include "DNA_screen_types.h"
  
+ #include "BLT_translation.h"
+ 
 +#include "BKE_context.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"