[Bf-blender-cvs] [efd7c95bb27] master: Cleanup: Remove duplicate special case check
Hans Goudey
noreply at git.blender.org
Mon Aug 2 21:45:33 CEST 2021
Commit: efd7c95bb27ccee31a34de03f15ad9542d19f7da
Author: Hans Goudey
Date: Mon Aug 2 15:45:25 2021 -0400
Branches: master
https://developer.blender.org/rBefd7c95bb27ccee31a34de03f15ad9542d19f7da
Cleanup: Remove duplicate special case check
===================================================================
M source/blender/blenkernel/intern/spline_base.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/spline_base.cc b/source/blender/blenkernel/intern/spline_base.cc
index 987152f34bc..dda7abea0fc 100644
--- a/source/blender/blenkernel/intern/spline_base.cc
+++ b/source/blender/blenkernel/intern/spline_base.cc
@@ -201,6 +201,7 @@ static void calculate_tangents(Span<float3> positions,
MutableSpan<float3> tangents)
{
if (positions.size() == 1) {
+ tangents.first() = float3(0.0f, 0.0f, 1.0f);
return;
}
@@ -241,13 +242,8 @@ Span<float3> Spline::evaluated_tangents() const
Span<float3> positions = this->evaluated_positions();
- if (eval_size == 1) {
- evaluated_tangents_cache_.first() = float3(1.0f, 0.0f, 0.0f);
- }
- else {
- calculate_tangents(positions, is_cyclic_, evaluated_tangents_cache_);
- this->correct_end_tangents();
- }
+ calculate_tangents(positions, is_cyclic_, evaluated_tangents_cache_);
+ this->correct_end_tangents();
tangent_cache_dirty_ = false;
return evaluated_tangents_cache_;
More information about the Bf-blender-cvs
mailing list