Merge branch 'master' into blender2.8

2 files changed, 20 insertions, 21 deletions

diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index a2bc38a7b5e..046037d8b1d 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -144,7 +144,7 @@ static void calculate_pending_func(void *data_v, int i)
 	/* count number of inputs that need updates */
 	if ((node->flag & DEPSOP_FLAG_NEEDS_UPDATE) != 0) {
 		foreach (DepsRelation *rel, node->inlinks) {
-			if (rel->from->type == DEPSNODE_TYPE_OPERATION &&
+			if (rel->from->type == DEG_NODE_TYPE_OPERATION &&
 			    (rel->flag & DEPSREL_FLAG_CYCLIC) == 0)
 			{
 				OperationDepsNode *from = (OperationDepsNode *)rel->from;
@@ -185,7 +185,7 @@ static void calculate_eval_priority(OperationDepsNode *node)
 
 		foreach (DepsRelation *rel, node->outlinks) {
 			OperationDepsNode *to = (OperationDepsNode *)rel->to;
-			BLI_assert(to->type == DEPSNODE_TYPE_OPERATION);
+			BLI_assert(to->type == DEG_NODE_TYPE_OPERATION);
 			calculate_eval_priority(to);
 			node->eval_priority += to->eval_priority;
 		}
@@ -246,7 +246,7 @@ static void schedule_children(TaskPool *pool,
 {
 	foreach (DepsRelation *rel, node->outlinks) {
 		OperationDepsNode *child = (OperationDepsNode *)rel->to;
-		BLI_assert(child->type == DEPSNODE_TYPE_OPERATION);
+		BLI_assert(child->type == DEG_NODE_TYPE_OPERATION);
 		if (child->scheduled) {
 			/* Happens when having cyclic dependencies. */
 			continue;
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index afcf6994253..34abbf46ed7 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -165,30 +165,29 @@ void deg_graph_flush_updates(Main *bmain, Depsgraph *graph)
 					 * layers visibility update has proper flags to work with.
 					 */
 					switch (comp_node->type) {
-						case DEPSNODE_TYPE_UNDEFINED:
-						case DEPSNODE_TYPE_OPERATION:
-						case DEPSNODE_TYPE_ROOT:
-						case DEPSNODE_TYPE_TIMESOURCE:
-						case DEPSNODE_TYPE_ID_REF:
-						case DEPSNODE_TYPE_SUBGRAPH:
-						case DEPSNODE_TYPE_PARAMETERS:
-						case DEPSNODE_TYPE_SEQUENCER:
-						case DEPSNODE_TYPE_LAYER_COLLECTIONS:
+						case DEG_NODE_TYPE_UNDEFINED:
+						case DEG_NODE_TYPE_OPERATION:
+						case DEG_NODE_TYPE_ROOT:
+						case DEG_NODE_TYPE_TIMESOURCE:
+						case DEG_NODE_TYPE_ID_REF:
+						case DEG_NODE_TYPE_PARAMETERS:
+						case DEG_NODE_TYPE_SEQUENCER:
+						case DEG_NODE_TYPE_LAYER_COLLECTIONS:
 							/* Ignore, does not translate to object component. */
 							break;
-						case DEPSNODE_TYPE_ANIMATION:
+						case DEG_NODE_TYPE_ANIMATION:
 							object->recalc |= OB_RECALC_TIME;
 							break;
-						case DEPSNODE_TYPE_TRANSFORM:
+						case DEG_NODE_TYPE_TRANSFORM:
 							object->recalc |= OB_RECALC_OB;
 							break;
-						case DEPSNODE_TYPE_GEOMETRY:
-						case DEPSNODE_TYPE_EVAL_POSE:
-						case DEPSNODE_TYPE_BONE:
-						case DEPSNODE_TYPE_EVAL_PARTICLES:
-						case DEPSNODE_TYPE_SHADING:
-						case DEPSNODE_TYPE_CACHE:
-						case DEPSNODE_TYPE_PROXY:
+						case DEG_NODE_TYPE_GEOMETRY:
+						case DEG_NODE_TYPE_EVAL_POSE:
+						case DEG_NODE_TYPE_BONE:
+						case DEG_NODE_TYPE_EVAL_PARTICLES:
+						case DEG_NODE_TYPE_SHADING:
+						case DEG_NODE_TYPE_CACHE:
+						case DEG_NODE_TYPE_PROXY:
 							object->recalc |= OB_RECALC_DATA;
 							break;
 					}