[Bf-blender-cvs] [37a3a41de8d] functions: cleanup
Jacques Lucke
noreply at git.blender.org
Wed Jul 10 17:18:13 CEST 2019
Commit: 37a3a41de8d6c12ad3c6d5768bc05d7556301a67
Author: Jacques Lucke
Date: Wed Jul 10 16:21:28 2019 +0200
Branches: functions
https://developer.blender.org/rB37a3a41de8d6c12ad3c6d5768bc05d7556301a67
cleanup
===================================================================
M source/blender/simulations/bparticles/simulate.cpp
===================================================================
diff --git a/source/blender/simulations/bparticles/simulate.cpp b/source/blender/simulations/bparticles/simulate.cpp
index 2bef57c4107..946e4e5539e 100644
--- a/source/blender/simulations/bparticles/simulate.cpp
+++ b/source/blender/simulations/bparticles/simulate.cpp
@@ -153,14 +153,12 @@ BLI_NOINLINE static void compute_current_time_per_particle(
}
BLI_NOINLINE static void find_unfinished_particles(
- ArrayRef<uint> indices_with_event,
- ArrayRef<uint> particle_indices,
+ ArrayRef<uint> particle_indices_with_event,
ArrayRef<float> time_factors_to_next_event,
ArrayRef<uint8_t> kill_states,
VectorAdaptor<uint> &r_unfinished_particle_indices)
{
- for (uint i : indices_with_event) {
- uint pindex = particle_indices[i];
+ for (uint pindex : particle_indices_with_event) {
if (kill_states[pindex] == 0) {
float time_factor = time_factors_to_next_event[pindex];
@@ -263,8 +261,7 @@ BLI_NOINLINE static void simulate_to_next_event(ArrayAllocator &array_allocator,
event_storage,
attribute_offsets);
- find_unfinished_particles(indices_with_event,
- particles.indices(),
+ find_unfinished_particles(particle_indices_with_event,
time_factors_to_next_event,
particles.attributes().get_byte("Kill State"),
r_unfinished_particle_indices);
More information about the Bf-blender-cvs
mailing list