[Bf-blender-cvs] [bdcca74b237] functions: rename

[Jacques Lucke]

Commit: bdcca74b23768ff8906e85521cd32e436fffdacc
Author: Jacques Lucke
Date:   Wed Jul 24 14:47:05 2019 +0200
Branches: functions
https://developer.blender.org/rBbdcca74b23768ff8906e85521cd32e436fffdacc

rename

===================================================================

M	source/blender/simulations/bparticles/actions.cpp
M	source/blender/simulations/bparticles/particle_function.hpp

===================================================================

diff --git a/source/blender/simulations/bparticles/actions.cpp b/source/blender/simulations/bparticles/actions.cpp
index 0d0a3d63d3e..ffbbca933f8 100644
--- a/source/blender/simulations/bparticles/actions.cpp
+++ b/source/blender/simulations/bparticles/actions.cpp
@@ -16,7 +16,7 @@ void ChangeDirectionAction::execute(ActionInterface &interface)
   auto velocity_offsets = interface.attribute_offsets().try_get_float3("Velocity");
 
   auto caller = m_compute_inputs.get_caller(particles.attributes());
-  auto new_directions = caller.add_output_buffer<float3>(interface.array_allocator());
+  auto new_directions = caller.add_output<float3>(interface.array_allocator());
   caller.call(particles.pindices());
 
   for (uint pindex : particles.pindices()) {
@@ -63,8 +63,8 @@ void ExplodeAction::execute(ActionInterface &interface)
   Vector<float> new_birth_times;
 
   auto caller = m_compute_inputs.get_caller(particles.attributes());
-  auto parts_amounts = caller.add_output_buffer<int>(interface.array_allocator());
-  auto speeds = caller.add_output_buffer<float>(interface.array_allocator());
+  auto parts_amounts = caller.add_output<int>(interface.array_allocator());
+  auto speeds = caller.add_output<float>(interface.array_allocator());
   caller.call(particles.pindices());
 
   for (uint pindex : particles.pindices()) {
@@ -94,7 +94,7 @@ void ConditionAction::execute(ActionInterface &interface)
   ParticleSet particles = interface.particles();
 
   auto caller = m_compute_inputs.get_caller(particles.attributes());
-  auto conditions = caller.add_output_buffer<bool>(interface.array_allocator());
+  auto conditions = caller.add_output<bool>(interface.array_allocator());
   caller.call(particles.pindices());
 
   Vector<uint> true_pindices, false_pindices;
diff --git a/source/blender/simulations/bparticles/particle_function.hpp b/source/blender/simulations/bparticles/particle_function.hpp
index 75b8adfcef9..93147b1a8f3 100644
--- a/source/blender/simulations/bparticles/particle_function.hpp
+++ b/source/blender/simulations/bparticles/particle_function.hpp
@@ -28,7 +28,7 @@ class ParticleFunctionCaller {
   friend ParticleFunction;
 
  public:
-  template<typename T> void add_output_buffer(ArrayRef<T> array)
+  template<typename T> void add_output(ArrayRef<T> array)
   {
 #ifdef DEBUG
     uint index = m_output_buffers.size();
@@ -43,10 +43,10 @@ class ParticleFunctionCaller {
     m_output_strides.append(sizeof(T));
   }
 
-  template<typename T> ArrayAllocator::Array<T> add_output_buffer(ArrayAllocator &allocator)
+  template<typename T> ArrayAllocator::Array<T> add_output(ArrayAllocator &allocator)
   {
     ArrayAllocator::Array<T> array(allocator);
-    this->add_output_buffer(array.as_array_ref());
+    this->add_output(array.as_array_ref());
     return array;
   }