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

[Jacques Lucke]

Commit: d4f57524be9832faa344b1510cd2b8766e5835d7
Author: Jacques Lucke
Date:   Wed Jul 24 13:58:04 2019 +0200
Branches: functions
https://developer.blender.org/rBd4f57524be9832faa344b1510cd2b8766e5835d7

rename

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

M	source/blender/simulations/bparticles/action_interface.cpp
M	source/blender/simulations/bparticles/action_interface.hpp
M	source/blender/simulations/bparticles/events.hpp

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

diff --git a/source/blender/simulations/bparticles/action_interface.cpp b/source/blender/simulations/bparticles/action_interface.cpp
index a4df084b767..5f9c5d1ce44 100644
--- a/source/blender/simulations/bparticles/action_interface.cpp
+++ b/source/blender/simulations/bparticles/action_interface.cpp
@@ -18,7 +18,7 @@ ParticleFunctionCaller ParticleFunction::get_caller(AttributeArrays attributes,
     uint stride = 0;
     if (input_name.startswith("Event")) {
       StringRef event_attribute_name = input_name.drop_prefix("Event: ");
-      ptr = action_context.get_info_array(event_attribute_name);
+      ptr = action_context.get_context_array(event_attribute_name);
       stride = sizeof(float3); /* TODO make not hardcoded */
     }
     else if (input_name.startswith("Attribute")) {
diff --git a/source/blender/simulations/bparticles/action_interface.hpp b/source/blender/simulations/bparticles/action_interface.hpp
index ad5d7e2d997..6e341c75691 100644
--- a/source/blender/simulations/bparticles/action_interface.hpp
+++ b/source/blender/simulations/bparticles/action_interface.hpp
@@ -13,7 +13,7 @@ using FN::TupleCallBody;
 
 class ActionContext {
  public:
-  virtual void *get_info_array(StringRef name) = 0;
+  virtual void *get_context_array(StringRef name) = 0;
 };
 
 class ParticleFunction;
@@ -127,7 +127,7 @@ inline ActionInterface::ActionInterface(ParticleAllocator &particle_allocator,
 }
 
 class EmptyEventInfo : public ActionContext {
-  void *get_info_array(StringRef UNUSED(name))
+  void *get_context_array(StringRef UNUSED(name))
   {
     return nullptr;
   }
diff --git a/source/blender/simulations/bparticles/events.hpp b/source/blender/simulations/bparticles/events.hpp
index 6cc15c48cd5..c3e3337d0c3 100644
--- a/source/blender/simulations/bparticles/events.hpp
+++ b/source/blender/simulations/bparticles/events.hpp
@@ -48,7 +48,7 @@ class CollisionEventInfo : public ActionContext {
   {
   }
 
-  void *get_info_array(StringRef name) override
+  void *get_context_array(StringRef name) override
   {
     if (name == "Normal") {
       return (void *)m_normals.begin();