[Bf-blender-cvs] [bb537df8d0e] functions: cleanup remove unused return parameter

Jacques Lucke noreply at git.blender.org
Fri Jun 28 16:04:47 CEST 2019


Commit: bb537df8d0e0bfc8e6bbcf8f7c185758ccf4d221
Author: Jacques Lucke
Date:   Fri Jun 28 15:46:15 2019 +0200
Branches: functions
https://developer.blender.org/rBbb537df8d0e0bfc8e6bbcf8f7c185758ccf4d221

cleanup remove unused return parameter

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

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

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

diff --git a/source/blender/simulations/bparticles/simulate.cpp b/source/blender/simulations/bparticles/simulate.cpp
index 715eb5c000a..81ea59a5429 100644
--- a/source/blender/simulations/bparticles/simulate.cpp
+++ b/source/blender/simulations/bparticles/simulate.cpp
@@ -279,10 +279,10 @@ BLI_NOINLINE static void simulate_with_max_n_events(uint UNUSED(max_events),
                                                     ArrayRef<float> durations,
                                                     float end_time,
                                                     ParticleType &particle_type,
-                                                    SmallVector<uint> &r_unfinished_indices,
-                                                    SmallVector<float> &r_remaining_durations)
+                                                    SmallVector<uint> &r_unfinished_indices)
 {
   SmallVector<float> last_event_times;
+  SmallVector<float> remaining_durations;
 
   simulate_to_next_event(block_allocator,
                          particles,
@@ -292,7 +292,7 @@ BLI_NOINLINE static void simulate_with_max_n_events(uint UNUSED(max_events),
                          particle_type,
                          last_event_times,
                          r_unfinished_indices,
-                         r_remaining_durations);
+                         remaining_durations);
 }
 
 BLI_NOINLINE static void apply_remaining_offsets(ParticleSet particles, IdealOffsets ideal_offsets)
@@ -320,8 +320,6 @@ BLI_NOINLINE static void step_particle_set(BlockAllocator &block_allocator,
   compute_ideal_attribute_offsets(particles, durations, particle_type, ideal_offsets);
 
   SmallVector<uint> unfinished_indices;
-  SmallVector<float> remaining_durations;
-
   simulate_with_max_n_events(10,
                              block_allocator,
                              particles,
@@ -329,8 +327,7 @@ BLI_NOINLINE static void step_particle_set(BlockAllocator &block_allocator,
                              durations,
                              end_time,
                              particle_type,
-                             unfinished_indices,
-                             remaining_durations);
+                             unfinished_indices);
 
   SmallVector<uint> remaining_particle_indices(unfinished_indices.size());
   SmallVector<float3> remaining_position_offsets(unfinished_indices.size());



More information about the Bf-blender-cvs mailing list