[Bf-blender-cvs] [3bb51bb1622] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 3bb51bb162292d0ed51d244130f69a36430fe4da
Author: Antonio Vazquez
Date:   Thu Feb 22 15:48:25 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB3bb51bb162292d0ed51d244130f69a36430fe4da

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenkernel/BKE_modifier.h
index 568fe2830b4,ac9c2c50df2..d7e8efcee47
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@@ -34,10 -34,7 +34,8 @@@
  
  struct ID;
  struct DerivedMesh;
- struct DagForest;
- struct DagNode;
  struct EvaluationContext;
 +struct bContext;
  struct Object;
  struct Scene;
  struct ViewLayer;