Merge branch 'master' into blender2.8

2017-12-20 16:40:49 +01:00
parent f6766c31cf 3474db4b37
commit a52452c043
32 changed files with 482 additions and 305 deletions
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -36,6 +36,7 @@
 #include "intern/depsgraph.h"
 #include "intern/depsgraph_types.h"
 #include "intern/nodes/deg_node.h"
+#include "intern/nodes/deg_node_id.h"

 #include "util/deg_util_foreach.h"