[Bf-blender-cvs] [90021402e2d] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 90021402e2de56ba9100c3c2464165d1a1d358a2
Author: Sergey Sharybin
Date:   Mon Dec 18 16:50:21 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB90021402e2de56ba9100c3c2464165d1a1d358a2

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/nodes/deg_node_component.cc
index f4530ecebdb,8ac73671678..d3405118f57
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
@@@ -398,7 -378,19 +374,23 @@@ void BoneComponentDepsNode::init(const 
  	this->pchan = BKE_pose_channel_find_name(object->pose, subdata);
  }
  
- DEG_COMPONENT_DEFINE(Bone, BONE);
+ /* Register all components. =============================== */
+ 
+ DEG_COMPONENT_NODE_DEFINE(Animation,         ANIMATION,          ID_RECALC_NONE);
++DEG_COMPONENT_NODE_DEFINE(BatchCache,        BATCH_CACHE,        ID_RECALC_NONE);
+ DEG_COMPONENT_NODE_DEFINE(Bone,              BONE,               ID_RECALC_NONE);
+ DEG_COMPONENT_NODE_DEFINE(Cache,             CACHE,              ID_RECALC_NONE);
++DEG_COMPONENT_NODE_DEFINE(CopyOnWrite,       COPY_ON_WRITE,      ID_RECALC_NONE);
+ DEG_COMPONENT_NODE_DEFINE(Geometry,          GEOMETRY,           ID_RECALC_NONE);
++DEG_COMPONENT_NODE_DEFINE(LayerCollections,  LAYER_COLLECTIONS,  ID_RECALC_NONE);
+ DEG_COMPONENT_NODE_DEFINE(Parameters,        PARAMETERS,         ID_RECALC_NONE);
+ DEG_COMPONENT_NODE_DEFINE(Particles,         EVAL_PARTICLES,     ID_RECALC_NONE);
+ DEG_COMPONENT_NODE_DEFINE(Proxy,             PROXY,              ID_RECALC_NONE);
+ DEG_COMPONENT_NODE_DEFINE(Pose,              EVAL_POSE,          ID_RECALC_NONE);
+ DEG_COMPONENT_NODE_DEFINE(Sequencer,         SEQUENCER,          ID_RECALC_NONE);
+ DEG_COMPONENT_NODE_DEFINE(Shading,           SHADING,            ID_RECALC_NONE);
++DEG_COMPONENT_NODE_DEFINE(ShadingParameters, SHADING_PARAMETERS, ID_RECALC_NONE);
+ DEG_COMPONENT_NODE_DEFINE(Transform,         TRANSFORM,          ID_RECALC_NONE);
  
  /* Node Types Register =================================== */
  
diff --cc source/blender/depsgraph/intern/nodes/deg_node_component.h
index ba4f8551fea,702697eba3a..882a16adf82
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h
@@@ -164,25 -166,34 +164,38 @@@ struct ComponentDepsNode : public DepsN
  
  /* ---------------------------------------- */
  
- #define DEG_COMPONENT_DECLARE_GENERIC(name)                        \
+ #define DEG_COMPONENT_NODE_DEFINE_TYPEINFO(NodeType, type_, tname_, id_recalc_tag) \
+     const DepsNode::TypeInfo NodeType::typeinfo = \
+         DepsNode::TypeInfo(type_, tname_, id_recalc_tag)
+ 
+ #define DEG_COMPONENT_NODE_DECLARE DEG_DEPSNODE_DECLARE
+ 
+ #define DEG_COMPONENT_NODE_DEFINE(name, NAME, id_recalc_tag)            \
+     DEG_COMPONENT_NODE_DEFINE_TYPEINFO(name ## ComponentDepsNode,       \
+                                        DEG_NODE_TYPE_ ## NAME,          \
+                                        #name  " Component",             \
+                                        id_recalc_tag) ;                 \
+     static DepsNodeFactoryImpl<name ## ComponentDepsNode> DNTI_ ## NAME
+ 
+ #define DEG_COMPONENT_NODE_DECLARE_GENERIC(name)                   \
  	struct name ## ComponentDepsNode : public ComponentDepsNode {  \
- 		DEG_DEPSNODE_DECLARE;                                      \
+ 		DEG_COMPONENT_NODE_DECLARE;                                \
  	}
  
- DEG_COMPONENT_DECLARE_GENERIC(Animation);
- DEG_COMPONENT_DECLARE_GENERIC(BatchCache);
- 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);
+ DEG_COMPONENT_NODE_DECLARE_GENERIC(Animation);
++DEG_COMPONENT_NODE_DECLARE_GENERIC(BatchCache);
+ DEG_COMPONENT_NODE_DECLARE_GENERIC(Cache);
++DEG_COMPONENT_NODE_DECLARE_GENERIC(CopyOnWrite);
+ DEG_COMPONENT_NODE_DECLARE_GENERIC(Geometry);
++DEG_COMPONENT_NODE_DECLARE_GENERIC(LayerCollections);
+ DEG_COMPONENT_NODE_DECLARE_GENERIC(Parameters);
+ DEG_COMPONENT_NODE_DECLARE_GENERIC(Particles);
+ DEG_COMPONENT_NODE_DECLARE_GENERIC(Proxy);
+ DEG_COMPONENT_NODE_DECLARE_GENERIC(Pose);
+ DEG_COMPONENT_NODE_DECLARE_GENERIC(Sequencer);
+ DEG_COMPONENT_NODE_DECLARE_GENERIC(Shading);
++DEG_COMPONENT_NODE_DECLARE_GENERIC(ShadingParameters);
+ DEG_COMPONENT_NODE_DECLARE_GENERIC(Transform);
  
  /* Bone Component */
  struct BoneComponentDepsNode : public ComponentDepsNode {
diff --cc source/blender/makesdna/DNA_ID.h
index 0b8778674b3,81c0b6f656b..ae908b1aabc
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@@ -458,8 -358,11 +458,9 @@@ enum 
  
  enum {
  	/* RESET_AFTER_USE, used by update code (depsgraph). */
+ 	ID_RECALC_NONE  = 0,
  	ID_RECALC       = 1 << 0,
 -	ID_RECALC_DATA  = 1 << 1,
 -	ID_RECALC_SKIP_ANIM_TAG  = 1 << 2,
 -	ID_RECALC_ALL   = (ID_RECALC | ID_RECALC_DATA),
 +	ID_RECALC_ALL   = ID_RECALC,
  };
  
  /* To filter ID types (filter_id) */