[Bf-blender-cvs] [27081694f91] functions: rename

Jacques Lucke noreply at git.blender.org
Mon Sep 2 15:40:22 CEST 2019


Commit: 27081694f914787c53e5a68e9b5e8911bcb5a721
Author: Jacques Lucke
Date:   Mon Sep 2 15:07:24 2019 +0200
Branches: functions
https://developer.blender.org/rB27081694f914787c53e5a68e9b5e8911bcb5a721

rename

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

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

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

diff --git a/source/blender/simulations/bparticles/action_interface.hpp b/source/blender/simulations/bparticles/action_interface.hpp
index c9fdc40120d..98cc4f409ad 100644
--- a/source/blender/simulations/bparticles/action_interface.hpp
+++ b/source/blender/simulations/bparticles/action_interface.hpp
@@ -82,7 +82,7 @@ inline ActionInterface::ActionInterface(ParticleAllocator &particle_allocator,
 {
 }
 
-class EmptyEventInfo : public ActionContext {
+class EmptyActionContext : public ActionContext {
 };
 
 inline void Action::execute_from_emitter(ParticleSets &particle_sets,
@@ -92,7 +92,7 @@ inline void Action::execute_from_emitter(ParticleSets &particle_sets,
   AttributesInfo info;
   std::array<void *, 0> buffers;
 
-  EmptyEventInfo empty_action_context;
+  EmptyActionContext empty_action_context;
   ActionContext &used_action_context = (action_context == nullptr) ? empty_action_context :
                                                                      *action_context;
 
@@ -114,7 +114,7 @@ inline void Action::execute_from_emitter(ParticleSets &particle_sets,
 inline void Action::execute_from_event(EventExecuteInterface &event_interface,
                                        ActionContext *action_context)
 {
-  EmptyEventInfo empty_action_context;
+  EmptyActionContext empty_action_context;
   ActionContext &used_action_context = (action_context == nullptr) ? empty_action_context :
                                                                      *action_context;
 
@@ -145,7 +145,7 @@ inline void Action::execute_for_new_particles(ParticleSets &particle_sets,
   std::array<void *, 0> buffers;
 
   /* Use empty action context, until there a better solution is implemented. */
-  EmptyEventInfo empty_context;
+  EmptyActionContext empty_context;
 
   for (ParticleSet particles : particle_sets.sets()) {
     uint min_array_size = particles.attributes().size();
@@ -168,7 +168,7 @@ inline void Action::execute_for_new_particles(ParticleSets &particle_sets,
   AttributesInfo info;
   std::array<void *, 0> buffers;
 
-  EmptyEventInfo empty_context;
+  EmptyActionContext empty_context;
 
   for (ParticleSet particles : particle_sets.sets()) {
     uint min_array_size = particles.attributes().size();



More information about the Bf-blender-cvs mailing list