diff options
| author | Sergey Sharybin <sergey@blender.org> | 2020-11-12 11:26:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2020-11-12 11:26:20 +0300 |
| commit | de6cee4fc1913982b0b2bd786bfd813c935bbe73 (patch) | |
| tree | a726c0c63bbd1d6c47c90c32119ce14c8048cddc /source/blender/depsgraph/intern/builder/pipeline_all_objects.cc | |
| parent | e4d432500a0e2f978fe019da43deb843da405032 (diff) | |
| parent | 88bb29dea668df8cc46aa7f55895f229748bdbb4 (diff) | |
Merge branch 'master' into codesign_error_tracker
Diffstat (limited to 'source/blender/depsgraph/intern/builder/pipeline_all_objects.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/pipeline_all_objects.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc b/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc index 81d239239be..d02aa16f26b 100644 --- a/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc +++ b/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc @@ -25,8 +25,7 @@ #include "DNA_layer_types.h" -namespace blender { -namespace deg { +namespace blender::deg { namespace { @@ -73,5 +72,4 @@ unique_ptr<DepsgraphRelationBuilder> AllObjectsBuilderPipeline::construct_relati return std::make_unique<AllObjectsRelationBuilder>(bmain_, deg_graph_, &builder_cache_); } -} // namespace deg -} // namespace blender +} // namespace blender::deg |