diff options
Diffstat (limited to 'source/blender/blenkernel')
5 files changed, 10 insertions, 20 deletions
diff --git a/source/blender/blenkernel/BKE_derived_node_tree.hh b/source/blender/blenkernel/BKE_derived_node_tree.hh index 59f38355330..2ed96f0c60d 100644 --- a/source/blender/blenkernel/BKE_derived_node_tree.hh +++ b/source/blender/blenkernel/BKE_derived_node_tree.hh @@ -32,8 +32,7 @@ #include "BKE_node_tree_ref.hh" -namespace blender { -namespace bke { +namespace blender::bke { class DSocket; class DInputSocket; @@ -494,7 +493,6 @@ inline Span<const DGroupInput *> DerivedNodeTree::group_inputs() const return group_inputs_.as_span(); } -} // namespace bke -} // namespace blender +} // namespace blender::bke #endif /* __BKE_DERIVED_NODE_TREE_HH__ */ diff --git a/source/blender/blenkernel/BKE_node_tree_ref.hh b/source/blender/blenkernel/BKE_node_tree_ref.hh index 619a84f6914..e25849cb569 100644 --- a/source/blender/blenkernel/BKE_node_tree_ref.hh +++ b/source/blender/blenkernel/BKE_node_tree_ref.hh @@ -58,8 +58,7 @@ #include "RNA_access.h" -namespace blender { -namespace bke { +namespace blender::bke { class SocketRef; class InputSocketRef; @@ -441,7 +440,6 @@ inline bNodeTree *NodeTreeRef::btree() const return btree_; } -} // namespace bke -} // namespace blender +} // namespace blender::bke #endif /* __BKE_NODE_TREE_REF_HH__ */ 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) { |