[Bf-blender-cvs] [558fa8b2568] smooth-curves: Fix clamping of auto handle in some rare case.

Benoit Bolsee noreply at git.blender.org
Sat Apr 29 20:59:34 CEST 2017


Commit: 558fa8b25680d4ec4c946d983b324b534c2a06c5
Author: Benoit Bolsee
Date:   Tue Dec 10 22:50:15 2013 +0100
Branches: smooth-curves
https://developer.blender.org/rB558fa8b25680d4ec4c946d983b324b534c2a06c5

Fix clamping of auto handle in some rare case.

===================================================================

M	source/blender/blenkernel/intern/curve.c

===================================================================

diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 58cf92cdddb..ebed8ba4417 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -3538,15 +3538,17 @@ void BKE_nurb_handle_calc_smooth(BezTriple *first, int count)
 		/* avoid overshoot it any */
 		if (dy > 0.f) {
 			if (dy > (f = (next->vec[1][1]-y[i]))) {
-				dy = f;
-			} else if (dy > (f=l[i+1]*(y[i]-prev->vec[1][1]))) {
-				dy = f;
+				dy = (f < 0.f) ? 0.f : f;
+			}
+			if (dy > (f=l[i+1]*(y[i]-prev->vec[1][1]))) {
+				dy = (f < 0.f) ? 0.f : f;
 			}
 		} else {
 			if (dy < (f = (next->vec[1][1]-y[i]))) {
-				dy = f;
-			} else if (dy < (f = l[i+1]*(y[i]-prev->vec[1][1]))) {
-				dy = f;
+				dy = (f > 0.f) ? 0.f : f;
+			}
+			if (dy < (f = l[i+1]*(y[i]-prev->vec[1][1]))) {
+				dy = (f > 0.f) ? 0.f : f;
 			}
 		}
 		bezt->vec[2][1] = y[i]+dy;




More information about the Bf-blender-cvs mailing list