diff options
| author | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
| commit | 0829cebeb024095c268f190c34daa8ae9a5a224c (patch) | |
| tree | 12ee5a4a1c2a32e12eff47c8eb9bb0ed217791c1 /source/blender/depsgraph/intern/builder/deg_builder_cycle.cc | |
| parent | cfde6ebf450594faa57c4bfeaecff10fe512c91b (diff) | |
| parent | 42be3964eb201180f6b0fa1ff6ce43b8c3845bc2 (diff) | |
Merge branch 'master' into asset-uuid--archivedasset-uuid--archived
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_cycle.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_cycle.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc index 6deecfde9e1..f8c7737c843 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc @@ -37,7 +37,8 @@ #include "intern/depsgraph.h" #include "intern/depsgraph_relation.h" -namespace DEG { +namespace blender { +namespace deg { namespace { @@ -234,4 +235,5 @@ void deg_graph_detect_cycles(Depsgraph *graph) } } -} // namespace DEG +} // namespace deg +} // namespace blender |