[Bf-blender-cvs] [46bd09b7893] functions: cleanup
Jacques Lucke
noreply at git.blender.org
Thu Aug 1 18:23:30 CEST 2019
Commit: 46bd09b7893bb57ce6ca4fbf953e4a894a11e740
Author: Jacques Lucke
Date: Thu Aug 1 15:56:00 2019 +0200
Branches: functions
https://developer.blender.org/rB46bd09b7893bb57ce6ca4fbf953e4a894a11e740
cleanup
===================================================================
M source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
M source/blender/simulations/bparticles/simulate.cpp
===================================================================
diff --git a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
index 056378bc900..b5825d1002d 100644
--- a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
@@ -52,7 +52,6 @@ BLI_NOINLINE void VTreeDataGraphBuilder::initialize_type_by_vsocket_map()
VTreeDataGraph VTreeDataGraphBuilder::build()
{
- m_graph_builder.to_dot__clipboard();
auto data_graph = m_graph_builder.build();
Vector<DataSocket> r_socket_map(m_vtree.socket_count(), DataSocket::None());
diff --git a/source/blender/simulations/bparticles/simulate.cpp b/source/blender/simulations/bparticles/simulate.cpp
index 922570637db..877058b01a6 100644
--- a/source/blender/simulations/bparticles/simulate.cpp
+++ b/source/blender/simulations/bparticles/simulate.cpp
@@ -636,6 +636,8 @@ BLI_NOINLINE static void emit_and_simulate_particles(ParticlesState &state,
void simulate_step(ParticlesState &state, StepDescription &step_description)
{
+ SCOPED_TIMER(__func__);
+
float start_time = state.current_time();
state.increase_time(step_description.step_duration());
TimeSpan time_span(start_time, step_description.step_duration());
More information about the Bf-blender-cvs
mailing list