[Bf-blender-cvs] [56a8977e92c] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: 56a8977e92cf297c95782301c9ac44dd9767b531
Author: Antonio Vazquez
Date:   Thu Sep 3 16:07:55 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB56a8977e92cf297c95782301c9ac44dd9767b531

Merge branch 'master' into greasepencil-edit-curve

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



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

diff --cc source/blender/editors/gpencil/gpencil_edit.c
index e2a0c1c653c,37338ec4592..5bbc2ddd0d2
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@@ -51,9 -52,10 +52,11 @@@
  #include "BKE_context.h"
  #include "BKE_global.h"
  #include "BKE_gpencil.h"
 +#include "BKE_gpencil_curve.h"
  #include "BKE_gpencil_geom.h"
+ #include "BKE_layer.h"
  #include "BKE_lib_id.h"
+ #include "BKE_library.h"
  #include "BKE_main.h"
  #include "BKE_material.h"
  #include "BKE_object.h"