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/nodes/deg_node_component.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h
@@ -46,6 +46,7 @@ namespace DEG {
 struct Depsgraph;
 struct OperationDepsNode;
 struct BoneComponentDepsNode;
+struct IDDepsNode;

 /* ID Component - Base type for all components */
 struct ComponentDepsNode : public DepsNode {