[Bf-blender-cvs] [35e8138c95d] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 35e8138c95d59851c772f96e5e5f507055fe38f0
Author: Sergey Sharybin
Date:   Thu Nov 23 15:26:53 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB35e8138c95d59851c772f96e5e5f507055fe38f0

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/nodes/deg_node_component.cc
index 4d64ac36f2b,26678d5b23a..aca25acd7c3
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
@@@ -329,40 -333,25 +329,28 @@@ void ComponentDepsNode::finalize_build(
  	operations_map = NULL;
  }
  
- /* Parameter Component Defines ============================ */
- 
- DEG_DEPSNODE_DEFINE(ParametersComponentDepsNode, DEG_NODE_TYPE_PARAMETERS, "Parameters Component");
- static DepsNodeFactoryImpl<ParametersComponentDepsNode> DNTI_PARAMETERS;
- 
- /* Animation Component Defines ============================ */
- 
- DEG_DEPSNODE_DEFINE(AnimationComponentDepsNode, DEG_NODE_TYPE_ANIMATION, "Animation Component");
- static DepsNodeFactoryImpl<AnimationComponentDepsNode> DNTI_ANIMATION;
- 
- /* Transform Component Defines ============================ */
- 
- DEG_DEPSNODE_DEFINE(TransformComponentDepsNode, DEG_NODE_TYPE_TRANSFORM, "Transform Component");
- static DepsNodeFactoryImpl<TransformComponentDepsNode> DNTI_TRANSFORM;
- 
- /* Proxy Component Defines ================================ */
- 
- DEG_DEPSNODE_DEFINE(ProxyComponentDepsNode, DEG_NODE_TYPE_PROXY, "Proxy Component");
- static DepsNodeFactoryImpl<ProxyComponentDepsNode> DNTI_PROXY;
- 
- /* Geometry Component Defines ============================= */
- 
- DEG_DEPSNODE_DEFINE(GeometryComponentDepsNode, DEG_NODE_TYPE_GEOMETRY, "Geometry Component");
- static DepsNodeFactoryImpl<GeometryComponentDepsNode> DNTI_GEOMETRY;
- 
- /* Sequencer Component Defines ============================ */
- 
- DEG_DEPSNODE_DEFINE(SequencerComponentDepsNode, DEG_NODE_TYPE_SEQUENCER, "Sequencer Component");
- static DepsNodeFactoryImpl<SequencerComponentDepsNode> DNTI_SEQUENCER;
- 
- /* Pose Component ========================================= */
- 
- DEG_DEPSNODE_DEFINE(PoseComponentDepsNode, DEG_NODE_TYPE_EVAL_POSE, "Pose Eval Component");
- static DepsNodeFactoryImpl<PoseComponentDepsNode> DNTI_EVAL_POSE;
+ /* Register all components. =============================== */
+ 
+ #define DEG_COMPONENT_DEFINE(name, NAME)                             \
+   DEG_DEPSNODE_DEFINE(name ## ComponentDepsNode,                     \
+                       DEG_NODE_TYPE_ ## NAME,                        \
+                       #name  " Component");                          \
+ static DepsNodeFactoryImpl<name ## ComponentDepsNode> DNTI_ ## NAME
+ 
+ 
+ DEG_COMPONENT_DEFINE(Animation, ANIMATION);
+ DEG_COMPONENT_DEFINE(Cache, CACHE);
++DEG_COMPONENT_DEFINE(CopyOnWrite, COPY_ON_WRITE);
+ DEG_COMPONENT_DEFINE(Geometry, GEOMETRY);
++DEG_COMPONENT_DEFINE(LayerCollections, LAYER_COLLECTIONS);
+ DEG_COMPONENT_DEFINE(Parameters, PARAMETERS);
+ DEG_COMPONENT_DEFINE(Particles, EVAL_PARTICLES);
+ DEG_COMPONENT_DEFINE(Proxy, PROXY);
+ DEG_COMPONENT_DEFINE(Pose, EVAL_POSE);
+ DEG_COMPONENT_DEFINE(Sequencer, SEQUENCER);
+ DEG_COMPONENT_DEFINE(Shading, SHADING);
++DEG_COMPONENT_DEFINE(ShadingParameters, SHADING_PARAMETERS);
+ DEG_COMPONENT_DEFINE(Transform, TRANSFORM);
  
  /* Bone Component ========================================= */
  
diff --cc source/blender/depsgraph/intern/nodes/deg_node_component.h
index d2a375421fd,eddef3f6635..3fef313b1e4
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h
@@@ -156,33 -158,21 +156,24 @@@ struct ComponentDepsNode : public DepsN
  
  /* ---------------------------------------- */
  
- struct ParametersComponentDepsNode : public ComponentDepsNode {
- 	DEG_DEPSNODE_DECLARE;
- };
- 
- struct AnimationComponentDepsNode : public ComponentDepsNode {
- 	DEG_DEPSNODE_DECLARE;
- };
- 
- struct TransformComponentDepsNode : public ComponentDepsNode {
- 	DEG_DEPSNODE_DECLARE;
- };
- 
- struct ProxyComponentDepsNode : public ComponentDepsNode {
- 	DEG_DEPSNODE_DECLARE;
- };
- 
- struct GeometryComponentDepsNode : public ComponentDepsNode {
- 	DEG_DEPSNODE_DECLARE;
- };
- 
- struct SequencerComponentDepsNode : public ComponentDepsNode {
- 	DEG_DEPSNODE_DECLARE;
- };
- 
- struct PoseComponentDepsNode : public ComponentDepsNode {
- 	DEG_DEPSNODE_DECLARE;
- };
+ #define DEG_COMPONENT_DECLARE_GENERIC(name)                        \
+ 	struct name ## ComponentDepsNode : public ComponentDepsNode {  \
+ 		DEG_DEPSNODE_DECLARE;                                      \
+ 	}
+ 
+ DEG_COMPONENT_DECLARE_GENERIC(Animation);
+ DEG_COMPONENT_DECLARE_GENERIC(Cache);
++DEG_COMPONENT_DECLARE_GENERIC(CopyOnWrite);
+ DEG_COMPONENT_DECLARE_GENERIC(Geometry);
++DEG_COMPONENT_DECLARE_GENERIC(LayerCollections);
+ DEG_COMPONENT_DECLARE_GENERIC(Parameters);
+ DEG_COMPONENT_DECLARE_GENERIC(Particles);
+ DEG_COMPONENT_DECLARE_GENERIC(Proxy);
+ DEG_COMPONENT_DECLARE_GENERIC(Pose);
+ DEG_COMPONENT_DECLARE_GENERIC(Sequencer);
+ DEG_COMPONENT_DECLARE_GENERIC(Shading);
++DEG_COMPONENT_DECLARE_GENERIC(ShadingParameters);
+ DEG_COMPONENT_DECLARE_GENERIC(Transform);
  
  /* Bone Component */
  struct BoneComponentDepsNode : public ComponentDepsNode {