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

Jacques Lucke noreply at git.blender.org
Wed Jul 24 19:12:15 CEST 2019


Commit: f54507724fddc1fa3c56afc019f71ef633e1ea1f
Author: Jacques Lucke
Date:   Wed Jul 24 17:13:33 2019 +0200
Branches: functions
https://developer.blender.org/rBf54507724fddc1fa3c56afc019f71ef633e1ea1f

rename

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

M	source/blender/simulations/bparticles/particle_set.hpp
M	source/blender/simulations/bparticles/simulate.cpp

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

diff --git a/source/blender/simulations/bparticles/particle_set.hpp b/source/blender/simulations/bparticles/particle_set.hpp
index 39da20b55ba..061e1eeab9a 100644
--- a/source/blender/simulations/bparticles/particle_set.hpp
+++ b/source/blender/simulations/bparticles/particle_set.hpp
@@ -44,7 +44,7 @@ struct ParticleSet {
   /**
    * Returns true when pindices()[i] == i for all i, otherwise false.
    */
-  bool indices_are_trivial();
+  bool pindices_are_trivial();
 };
 
 class ParticleSets {
@@ -123,7 +123,7 @@ inline uint ParticleSet::size()
   return m_pindices.size();
 }
 
-inline bool ParticleSet::indices_are_trivial()
+inline bool ParticleSet::pindices_are_trivial()
 {
   if (m_pindices.size() == 0) {
     return true;
diff --git a/source/blender/simulations/bparticles/simulate.cpp b/source/blender/simulations/bparticles/simulate.cpp
index 85dd266467b..368dd881e77 100644
--- a/source/blender/simulations/bparticles/simulate.cpp
+++ b/source/blender/simulations/bparticles/simulate.cpp
@@ -81,7 +81,7 @@ BLI_NOINLINE static void forward_particles_to_next_event_or_end(
     auto values = particles.attributes().get_float3(name);
     auto offsets = attribute_offsets.get_float3(attribute_index);
 
-    if (particles.indices_are_trivial()) {
+    if (particles.pindices_are_trivial()) {
       for (uint pindex = 0; pindex < particles.size(); pindex++) {
         float time_factor = time_factors_to_next_event[pindex];
         values[pindex] += time_factor * offsets[pindex];
@@ -304,7 +304,7 @@ BLI_NOINLINE static void apply_remaining_offsets(BlockStepData &step_data, Array
     auto values = particles.attributes().get_float3(name);
     auto offsets = attribute_offsets.get_float3(attribute_index);
 
-    if (particles.indices_are_trivial()) {
+    if (particles.pindices_are_trivial()) {
       add_float3_arrays(values.take_front(particles.size()), offsets.take_front(particles.size()));
     }
     else {



More information about the Bf-blender-cvs mailing list