diff options
| author | Jacques Lucke <mail@jlucke.com> | 2019-09-12 16:45:55 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2019-09-12 16:45:55 +0300 |
| commit | 592470b07b405547f7a8065ff5330f9f0a882b95 (patch) | |
| tree | 4257694854993528118c9708ec3c416de002488f /source/blender/simulations/bparticles/forces.cpp | |
| parent | 971ad95f2bac3f2d141693bfcc7c6b190db43344 (diff) | |
simplify code by changing ownership of particle functions
Diffstat (limited to 'source/blender/simulations/bparticles/forces.cpp')
| -rw-r--r-- | source/blender/simulations/bparticles/forces.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/simulations/bparticles/forces.cpp b/source/blender/simulations/bparticles/forces.cpp index 5ee4ee6044c..ffd16aca14c 100644 --- a/source/blender/simulations/bparticles/forces.cpp +++ b/source/blender/simulations/bparticles/forces.cpp @@ -12,7 +12,7 @@ void GravityForce::add_force(ForceInterface &interface) { MutableArrayRef<float3> destination = interface.combined_destination(); - auto inputs = m_compute_inputs->compute(interface); + auto inputs = m_inputs_fn->compute(interface); TemporaryArray<float> weights(destination.size()); m_falloff->compute(interface.attributes(), interface.pindices(), weights); @@ -29,7 +29,7 @@ void TurbulenceForce::add_force(ForceInterface &interface) MutableArrayRef<float3> destination = interface.combined_destination(); auto positions = interface.attributes().get<float3>("Position"); - auto inputs = m_compute_inputs->compute(interface); + auto inputs = m_inputs_fn->compute(interface); TemporaryArray<float> weights(destination.size()); m_falloff->compute(interface.attributes(), interface.pindices(), weights); @@ -50,7 +50,7 @@ void DragForce::add_force(ForceInterface &interface) MutableArrayRef<float3> destination = interface.combined_destination(); auto velocities = interface.attributes().get<float3>("Velocity"); - auto inputs = m_compute_inputs->compute(interface); + auto inputs = m_inputs_fn->compute(interface); TemporaryArray<float> weights(destination.size()); m_falloff->compute(interface.attributes(), interface.pindices(), weights); @@ -68,7 +68,7 @@ void MeshForce::add_force(ForceInterface &interface) MutableArrayRef<float3> destination = interface.combined_destination(); auto positions = interface.attributes().get<float3>("Position"); - auto inputs = m_compute_inputs->compute(interface); + auto inputs = m_inputs_fn->compute(interface); for (uint pindex : interface.pindices()) { float3 position = positions[pindex]; |