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

[Antonio Vazquez]

Commit: e6dc574f9a6e19bfa45af94b95bdca6dd73c80de
Author: Antonio Vazquez
Date:   Wed Oct 18 16:45:51 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBe6dc574f9a6e19bfa45af94b95bdca6dd73c80de

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes.h
index f53f23a2811,dbb126e2078..092b5842a7f
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
@@@ -32,9 -32,10 +32,11 @@@
  
  #include "intern/depsgraph_types.h"
  
+ #include "DEG_depsgraph.h"  /* used for DEG_depsgraph_use_copy_on_write() */
+ 
  struct CacheFile;
  struct bGPdata;
 +struct Palette;
  struct ListBase;
  struct GHash;
  struct ID;