Commit: 9f53e984720b17c3f57adffb073f6d4129c2eb8d
Author: Jacques Lucke
Date: Fri Jun 21 11:32:55 2019 +0200
Branches: functions
https://developer.blender.org/rB9f53e984720b17c3f57adffb073f6d4129c2eb8d
minor cleanup
===================================================================
M source/blender/simulations/bparticles/c_wrapper.cpp
M source/blender/simulations/bparticles/events.cpp
===================================================================
diff --git a/source/blender/simulations/bparticles/c_wrapper.cpp
b/source/blender/simulations/bparticles/c_wrapper.cpp
index 0e9cad638e4..7556a77b29e 100644
--- a/source/blender/simulations/bparticles/c_wrapper.cpp
+++ b/source/blender/simulations/bparticles/c_wrapper.cpp
@@ -133,7 +133,7 @@ void BParticles_simulate_modifier(NodeParticlesModifierData
*npmd,
description.m_influences.m_events.append(EVENT_age_reached(6.0f).release());
description.m_influences.m_actions.append(ACTION_kill().release());
description.m_influences.m_events.append(EVENT_age_reached(3.0f).release());
- description.m_influences.m_actions.append(ACTION_move({0, 10, 0}).release());
+ description.m_influences.m_actions.append(ACTION_move({0, 1, 0}).release());
simulate_step(state, description);
std::cout << "Active Blocks: " << state.m_container->active_blocks().size()
<< "\n";
diff --git a/source/blender/simulations/bparticles/events.cpp
b/source/blender/simulations/bparticles/events.cpp
index 46340afef51..576be833394 100644
--- a/source/blender/simulations/bparticles/events.cpp
+++ b/source/blender/simulations/bparticles/events.cpp
@@ -28,8 +28,7 @@ class AgeReachedEvent : public Event {
float age = end_time - birth_time;
if (age >= m_age && age - duration < m_age) {
r_filtered_indices.append(i);
- float time_factor =
- TimeSpan(end_time - duration, duration).get_factor(birth_time +
m_age) + 0.00001f;
+ float time_factor = TimeSpan(end_time - duration,
duration).get_factor(birth_time + m_age);
r_time_factors.append(time_factor);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
