diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-23 15:35:46 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-23 15:35:46 +0300 |
| commit | 2183f93dbed2043e72c21833218ccf341ee4df36 (patch) | |
| tree | 52b5e99ea3258c200b458a3649a6e6e1d7dc9061 /source/blender/depsgraph/intern | |
| parent | 89f7fb0aef8d420408ff3fcc0180f63ebef0d64b (diff) | |
| parent | 41cf2d9042bfe96d8515ffd2f27a3e671464bc21 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h index 9fa6b38166d..62059600b72 100644 --- a/source/blender/depsgraph/intern/depsgraph.h +++ b/source/blender/depsgraph/intern/depsgraph.h @@ -64,13 +64,10 @@ struct OperationDepsNode; /* Settings/Tags on Relationship */ typedef enum eDepsRelation_Flag { - /* "touched" tag is used when filtering, to know which to collect */ - DEPSREL_FLAG_TEMP_TAG = (1 << 0), - /* "cyclic" link - when detecting cycles, this relationship was the one - * which triggers a cyclic relationship to exist in the graph + * which triggers a cyclic relationship to exist in the graph. */ - DEPSREL_FLAG_CYCLIC = (1 << 1), + DEPSREL_FLAG_CYCLIC = (1 << 0), } eDepsRelation_Flag; /* B depends on A (A -> B) */ |