[Bf-blender-cvs] [2c3d53cf7f3] functions: minor changes
Jacques Lucke
noreply at git.blender.org
Sun Jun 30 16:01:31 CEST 2019
Commit: 2c3d53cf7f3d0ffd3319741ee6a135b2b62cb819
Author: Jacques Lucke
Date: Sun Jun 30 15:59:47 2019 +0200
Branches: functions
https://developer.blender.org/rB2c3d53cf7f3d0ffd3319741ee6a135b2b62cb819
minor changes
===================================================================
M source/blender/blenlib/BLI_timeit.hpp
M source/blender/simulations/bparticles/events.cpp
===================================================================
diff --git a/source/blender/blenlib/BLI_timeit.hpp b/source/blender/blenlib/BLI_timeit.hpp
index 4ba84afcf3a..dfb4ee9a0da 100644
--- a/source/blender/blenlib/BLI_timeit.hpp
+++ b/source/blender/blenlib/BLI_timeit.hpp
@@ -88,6 +88,9 @@ class ScopedTimerStatistics {
std::cout << " Shortest: ";
print_duration(m_shortest_duration);
std::cout << "\n";
+ std::cout << " Last: ";
+ print_duration(duration);
+ std::cout << "\n";
}
};
diff --git a/source/blender/simulations/bparticles/events.cpp b/source/blender/simulations/bparticles/events.cpp
index 349f8babe6e..89d83fe7c2c 100644
--- a/source/blender/simulations/bparticles/events.cpp
+++ b/source/blender/simulations/bparticles/events.cpp
@@ -104,7 +104,7 @@ class MeshBounceEvent : public Event {
position_offsets[pindex].reflect(data.normal);
/* Temporary solution to avoid double collision. */
- positions[pindex] += velocities[pindex] * 0.01f;
+ positions[pindex] += velocities[pindex] * 0.0001f;
}
}
};
More information about the Bf-blender-cvs
mailing list