Merge branch 'master' into blender2.8

2018-04-23 14:35:46 +02:00
parent 89f7fb0aef 41cf2d9042
commit 2183f93dbe
1 changed files with 2 additions and 5 deletions
--- 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) */