From 76e252ead31d08f85925409b0974c1455b416a39 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Mon, 29 Jun 2020 14:47:00 +0200 Subject: Cleanup: use blender::bke namespace in simulation.cc --- source/blender/blenkernel/intern/simulation.cc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'source/blender/blenkernel/intern/simulation.cc') diff --git a/source/blender/blenkernel/intern/simulation.cc b/source/blender/blenkernel/intern/simulation.cc index 20a23ab8b38..eef848aff72 100644 --- a/source/blender/blenkernel/intern/simulation.cc +++ b/source/blender/blenkernel/intern/simulation.cc @@ -54,10 +54,6 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -using blender::float3; -using blender::MutableSpan; -using blender::Span; - static void simulation_init_data(ID *id) { Simulation *simulation = (Simulation *)id; @@ -168,6 +164,9 @@ void *BKE_simulation_add(Main *bmain, const char *name) return simulation; } +namespace blender { +namespace bke { + static MutableSpan get_particle_positions(ParticleSimulationState *state) { return MutableSpan( @@ -197,7 +196,7 @@ static void copy_particle_state_to_cow(ParticleSimulationState *state_orig, state_cow->tot_particles = state_orig->tot_particles; } -void BKE_simulation_data_update(Depsgraph *depsgraph, Scene *scene, Simulation *simulation) +static void simulation_data_update(Depsgraph *depsgraph, Scene *scene, Simulation *simulation) { int current_frame = scene->r.cfra; @@ -259,3 +258,11 @@ void BKE_simulation_data_update(Depsgraph *depsgraph, Scene *scene, Simulation * copy_particle_state_to_cow(state_orig, state_cow); } } + +} // namespace bke +} // namespace blender + +void BKE_simulation_data_update(Depsgraph *depsgraph, Scene *scene, Simulation *simulation) +{ + blender::bke::simulation_data_update(depsgraph, scene, simulation); +} -- cgit v1.2.3