[Bf-blender-cvs] [71ff935fd6b] blender-v2.91-release: Revert "Fix T80742: curve bevel fails with zero length handles at end-point"

Campbell Barton noreply at git.blender.org
Mon Nov 9 10:35:48 CET 2020


Commit: 71ff935fd6bb8d4aa5b93790cbde0af71be11497
Author: Campbell Barton
Date:   Mon Nov 9 20:32:47 2020 +1100
Branches: blender-v2.91-release
https://developer.blender.org/rB71ff935fd6bb8d4aa5b93790cbde0af71be11497

Revert "Fix T80742: curve bevel fails with zero length handles at end-point"

This reverts commit 4987b7d347a885916916a888c18401ea2fe552f4.

This introduced a slight change in curve direction at end-points
(while correct), it caused tests to fail.

Keep this change for 2.92, revert for 2.91.

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

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

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

diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index bc4cb231153..b2ebb56d828 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -2202,22 +2202,6 @@ static void bevel_list_calc_bisect(BevList *bl)
     bevp1 = bevp2;
     bevp2++;
   }
-
-  if (is_cyclic == false) {
-    bevp0 = &bl->bevpoints[0];
-    bevp1 = &bl->bevpoints[1];
-    sub_v3_v3v3(bevp0->dir, bevp1->vec, bevp0->vec);
-    if (normalize_v3(bevp0->dir) == 0.0f) {
-      copy_v3_v3(bevp0->dir, bevp1->dir);
-    }
-
-    bevp0 = &bl->bevpoints[bl->nr - 2];
-    bevp1 = &bl->bevpoints[bl->nr - 1];
-    sub_v3_v3v3(bevp1->dir, bevp1->vec, bevp0->vec);
-    if (normalize_v3(bevp1->dir) == 0.0f) {
-      copy_v3_v3(bevp1->dir, bevp0->dir);
-    }
-  }
 }
 static void bevel_list_flip_tangents(BevList *bl)
 {



More information about the Bf-blender-cvs mailing list