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

[Antonio Vazquez]

Commit: 7a5d1cb9d501d55210b60d07b31b80c39399cd94
Author: Antonio Vazquez
Date:   Wed Dec 16 15:46:20 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB7a5d1cb9d501d55210b60d07b31b80c39399cd94

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/blenkernel/BKE_gpencil_geom.h
index 83eb4fd20af,1c86df73d3c..2eb5315ba47
--- a/source/blender/blenkernel/BKE_gpencil_geom.h
+++ b/source/blender/blenkernel/BKE_gpencil_geom.h
@@@ -33,10 -31,9 +33,10 @@@ struct BoundBox
  struct Depsgraph;
  struct Main;
  struct Object;
 +struct RegionView3D;
  struct Scene;
+ struct bGPDcurve;
  struct bGPDframe;
- struct bGPDlayer;
  struct bGPDspoint;
  struct bGPDstroke;
  struct bGPdata;