[Bf-blender-cvs] [9386bcb29a6] functions: rename durations to remaining_durations

Jacques Lucke noreply at git.blender.org
Wed Jul 10 17:18:04 CEST 2019


Commit: 9386bcb29a6c58882f71277353de99a6c8489696
Author: Jacques Lucke
Date:   Wed Jul 10 15:45:28 2019 +0200
Branches: functions
https://developer.blender.org/rB9386bcb29a6c58882f71277353de99a6c8489696

rename durations to remaining_durations

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

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

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

diff --git a/source/blender/simulations/bparticles/simulate.cpp b/source/blender/simulations/bparticles/simulate.cpp
index fbe3f5c4817..6a68bd1e82b 100644
--- a/source/blender/simulations/bparticles/simulate.cpp
+++ b/source/blender/simulations/bparticles/simulate.cpp
@@ -395,11 +395,11 @@ BLI_NOINLINE static void simulate_block(ArrayAllocator &array_allocator,
                                         ParticleAllocator &particle_allocator,
                                         ParticlesBlock &block,
                                         ParticleType &particle_type,
-                                        ArrayRef<float> durations,
+                                        ArrayRef<float> remaining_durations,
                                         float end_time)
 {
   uint amount = block.active_amount();
-  BLI_assert(amount == durations.size());
+  BLI_assert(amount == remaining_durations.size());
 
   Integrator &integrator = particle_type.integrator();
   AttributesInfo &offsets_info = integrator.offset_attributes_info();
@@ -407,7 +407,7 @@ BLI_NOINLINE static void simulate_block(ArrayAllocator &array_allocator,
       offsets_info, array_allocator);
   AttributeArrays attribute_offsets = attribute_offsets_core.slice_all().slice(0, amount);
 
-  IntegratorInterface interface(block, durations, array_allocator, attribute_offsets);
+  IntegratorInterface interface(block, remaining_durations, array_allocator, attribute_offsets);
   integrator.integrate(interface);
 
   ArrayRef<Event *> events = particle_type.events();
@@ -425,7 +425,7 @@ BLI_NOINLINE static void simulate_block(ArrayAllocator &array_allocator,
                                particle_allocator,
                                block,
                                attribute_offsets,
-                               durations,
+                               remaining_durations,
                                end_time,
                                events,
                                unfinished_particle_indices);



More information about the Bf-blender-cvs mailing list