diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-07-03 15:25:20 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-07-03 15:25:20 +0300 |
| commit | 395b294b614f43faac0ffaef167aed1b94a53b8e (patch) | |
| tree | fb91d677fe1648d3646a6ba1f18e6f323aa77cd2 /source/blender/blenkernel/intern | |
| parent | 5fbf70b0d0c5a387d01bba4b4d536d166e16ac0e (diff) | |
Cleanup: use nested namespaces
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/derived_node_tree.cc | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/node_tree_ref.cc | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/simulation.cc | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/derived_node_tree.cc b/source/blender/blenkernel/intern/derived_node_tree.cc index 83ef45189bc..01317eeb5ce 100644 --- a/source/blender/blenkernel/intern/derived_node_tree.cc +++ b/source/blender/blenkernel/intern/derived_node_tree.cc @@ -20,8 +20,7 @@ #define UNINITIALIZED_ID UINT32_MAX -namespace blender { -namespace bke { +namespace blender::bke { static const NodeTreeRef &get_tree_ref(NodeTreeRefMap &node_tree_refs, bNodeTree *btree) { @@ -439,5 +438,4 @@ std::string DerivedNodeTree::to_dot() const return digraph.to_dot_string(); } -} // namespace bke -} // namespace blender +} // namespace blender::bke diff --git a/source/blender/blenkernel/intern/node_tree_ref.cc b/source/blender/blenkernel/intern/node_tree_ref.cc index 1803243d4cc..54ea2d338db 100644 --- a/source/blender/blenkernel/intern/node_tree_ref.cc +++ b/source/blender/blenkernel/intern/node_tree_ref.cc @@ -18,8 +18,7 @@ #include "BLI_dot_export.hh" -namespace blender { -namespace bke { +namespace blender::bke { NodeTreeRef::NodeTreeRef(bNodeTree *btree) : btree_(btree) { @@ -175,5 +174,4 @@ std::string NodeTreeRef::to_dot() const return digraph.to_dot_string(); } -} // namespace bke -} // namespace blender +} // namespace blender::bke diff --git a/source/blender/blenkernel/intern/simulation.cc b/source/blender/blenkernel/intern/simulation.cc index eef848aff72..c4a35141b0d 100644 --- a/source/blender/blenkernel/intern/simulation.cc +++ b/source/blender/blenkernel/intern/simulation.cc @@ -164,8 +164,7 @@ void *BKE_simulation_add(Main *bmain, const char *name) return simulation; } -namespace blender { -namespace bke { +namespace blender::bke { static MutableSpan<float3> get_particle_positions(ParticleSimulationState *state) { @@ -259,8 +258,7 @@ static void simulation_data_update(Depsgraph *depsgraph, Scene *scene, Simulatio } } -} // namespace bke -} // namespace blender +} // namespace blender::bke void BKE_simulation_data_update(Depsgraph *depsgraph, Scene *scene, Simulation *simulation) { |