diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-01 17:31:56 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-01 17:31:56 +0300 |
| commit | 237e17a957ea16d4f326f8babfdb49b8d954e529 (patch) | |
| tree | beb289cb17adf0d4b7ad3e539be0f727cb61476c /source/blender/depsgraph/intern/eval/deg_eval.cc | |
| parent | 3bc8e88643667e4b5c45ca7cbe8e61934c82c702 (diff) | |
| parent | e5d8b04abe0524ea31c1ef158a0cfba83e739b04 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern/eval/deg_eval.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval.cc | 6 |
1 files changed, 3 insertions, 3 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; |