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/depsgraph_registry.h | |
| parent | cfde6ebf450594faa57c4bfeaecff10fe512c91b (diff) | |
| parent | 42be3964eb201180f6b0fa1ff6ce43b8c3845bc2 (diff) | |
Merge branch 'master' into asset-uuid--archivedasset-uuid--archived
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph_registry.h')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_registry.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_registry.h b/source/blender/depsgraph/intern/depsgraph_registry.h index 967791d2fbf..dc29f9d8edf 100644 --- a/source/blender/depsgraph/intern/depsgraph_registry.h +++ b/source/blender/depsgraph/intern/depsgraph_registry.h @@ -27,7 +27,8 @@ struct Main; -namespace DEG { +namespace blender { +namespace deg { struct Depsgraph; @@ -35,4 +36,5 @@ void register_graph(Depsgraph *depsgraph); void unregister_graph(Depsgraph *depsgraph); Span<Depsgraph *> get_all_registered_graphs(Main *bmain); -} // namespace DEG +} // namespace deg +} // namespace blender |