1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/simulation/intern/particle_function.hh b/source/blender/simulation/intern/particle_function.hh
index eec4a700383..c9b35640b47 100644
--- a/source/blender/simulation/intern/particle_function.hh
+++ b/source/blender/simulation/intern/particle_function.hh
@@ -26,10 +26,15 @@
 
 namespace blender::sim {
 
+struct ParticleFunctionInputContext {
+  const SimulationSolveContext &solve_context;
+  const ParticleChunkContext &particles;
+};
+
 class ParticleFunctionInput {
  public:
   virtual ~ParticleFunctionInput() = default;
-  virtual void add_input(fn::AttributesRef attributes,
+  virtual void add_input(ParticleFunctionInputContext &context,
                          fn::MFParamsBuilder &params,
                          ResourceCollector &resources) const = 0;
 };
@@ -61,7 +66,7 @@ class ParticleFunctionEvaluator {
   ResourceCollector resources_;
   const ParticleFunction &particle_fn_;
   const SimulationSolveContext &solve_context_;
-  const ParticleChunkContext &particle_chunk_context_;
+  const ParticleChunkContext &particles_;
   IndexMask mask_;
   fn::MFContextBuilder global_context_;
   fn::MFContextBuilder per_particle_context_;
@@ -71,13 +76,13 @@ class ParticleFunctionEvaluator {
  public:
   ParticleFunctionEvaluator(const ParticleFunction &particle_fn,
                             const SimulationSolveContext &solve_context,
-                            const ParticleChunkContext &particle_chunk_context);
+                            const ParticleChunkContext &particles);
   ~ParticleFunctionEvaluator();
 
   void compute();
-  fn::GVSpan get(int output_index, StringRef expected_name) const;
+  fn::GVSpan get(int output_index, StringRef expected_name = "") const;
 
-  template<typename T> fn::VSpan<T> get(int output_index, StringRef expected_name) const
+  template<typename T> fn::VSpan<T> get(int output_index, StringRef expected_name = "") const
   {
     return this->get(output_index, expected_name).typed<T>();
   }