[Bf-blender-cvs] [913991262bd] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: 913991262bd0a2b3eee868dac73f55ad863f95a2
Author: Bastien Montagne
Date:   Thu Sep 21 12:29:13 2017 +0200
Branches: asset-engine
https://developer.blender.org/rB913991262bd0a2b3eee868dac73f55ad863f95a2

Merge branch 'master' into asset-engine

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 9dd8e5b792b,17f0c030bd0..65d8a02d15f
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@@ -80,8 -80,8 +80,9 @@@ extern "C" 
  #include "BKE_key.h"
  #include "BKE_lattice.h"
  #include "BKE_library.h"
 +#include "BKE_library_override.h"
  #include "BKE_main.h"
+ #include "BKE_mask.h"
  #include "BKE_material.h"
  #include "BKE_mesh.h"
  #include "BKE_mball.h"