Commit: 0767dad328bc9d9b2cc6df33ad7c8e5feb349c72
Author: Jacques Lucke
Date: Sat Jul 20 13:39:17 2019 +0200
Branches: functions
https://developer.blender.org/rB0767dad328bc9d9b2cc6df33ad7c8e5feb349c72
rename function
===================================================================
M source/blender/simulations/bparticles/integrator.cpp
M source/blender/simulations/bparticles/step_description_interfaces.hpp
===================================================================
diff --git a/source/blender/simulations/bparticles/integrator.cpp
b/source/blender/simulations/bparticles/integrator.cpp
index 927d68153fe..1b885052211 100644
--- a/source/blender/simulations/bparticles/integrator.cpp
+++ b/source/blender/simulations/bparticles/integrator.cpp
@@ -25,7 +25,7 @@ AttributesInfo &EulerIntegrator::offset_attributes_info()
void EulerIntegrator::integrate(IntegratorInterface &interface)
{
ParticlesBlock &block = interface.block();
- AttributeArrays r_offsets = interface.offset_targets();
+ AttributeArrays r_offsets = interface.offsets();
ArrayRef<float> durations = interface.durations();
ArrayAllocator::Array<float3> combined_force(interface.array_allocator());
diff --git
a/source/blender/simulations/bparticles/step_description_interfaces.hpp
b/source/blender/simulations/bparticles/step_description_interfaces.hpp
index 9d410ff4e94..dd2c8dab81b 100644
--- a/source/blender/simulations/bparticles/step_description_interfaces.hpp
+++ b/source/blender/simulations/bparticles/step_description_interfaces.hpp
@@ -220,7 +220,7 @@ class IntegratorInterface {
/**
* Get the arrays that the offsets should be written into.
*/
- AttributeArrays offset_targets();
+ AttributeArrays offsets();
};
class OffsetHandlerInterface {
@@ -401,7 +401,7 @@ inline ArrayRef<float> IntegratorInterface::durations()
return m_durations;
}
-inline AttributeArrays IntegratorInterface::offset_targets()
+inline AttributeArrays IntegratorInterface::offsets()
{
return m_offsets;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
