Merge branch 'master' into blender2.8
This commit is contained in:
commit
2183f93dbe
|
@ -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) */
|
||||
|
|
Loading…
Reference in New Issue