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

[Antonio Vazquez]

Commit: e37b251d7aa0c3cf75d4b2538523ceb1bb1ebdd8
Author: Antonio Vazquez
Date:   Fri Nov 24 16:45:14 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe37b251d7aa0c3cf75d4b2538523ceb1bb1ebdd8

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes.h
index a3de1baffc5,a68f756f6ca..234087177ac
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
@@@ -34,9 -34,9 +34,10 @@@
  
  #include "DEG_depsgraph.h"  /* used for DEG_depsgraph_use_copy_on_write() */
  
+ struct Base;
  struct CacheFile;
  struct bGPdata;
 +struct Palette;
  struct ListBase;
  struct GHash;
  struct ID;