[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60193] trunk/blender/source/blender/ blenkernel/intern/curve.c: Fix #36747: curve bevel and extrude issue

Sergey Sharybin sergey.vfx at gmail.com
Tue Sep 17 13:00:09 CEST 2013


Revision: 60193
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60193
Author:   nazgul
Date:     2013-09-17 11:00:09 +0000 (Tue, 17 Sep 2013)
Log Message:
-----------
Fix #36747: curve bevel and extrude issue

Was a small mistake in bevel list optimization,
no need to check whether first/last points are
the same coord if curve is not cyclic.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/curve.c

Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c	2013-09-17 10:02:54 UTC (rev 60192)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c	2013-09-17 11:00:09 UTC (rev 60193)
@@ -2665,9 +2665,16 @@
 	bl = bev->first;
 	while (bl) {
 		if (bl->nr) { /* null bevel items come from single points */
+			bool is_cyclic = bl->poly != -1;
 			nr = bl->nr;
-			bevp1 = (BevPoint *)(bl + 1);
-			bevp0 = bevp1 + (nr - 1);
+			if (is_cyclic) {
+				bevp1 = (BevPoint *)(bl + 1);
+				bevp0 = bevp1 + (nr - 1);
+			}
+			else {
+				bevp0 = (BevPoint *)(bl + 1);
+				bevp1 = bevp0 + 1;
+			}
 			nr--;
 			while (nr--) {
 				if (fabsf(bevp0->vec[0] - bevp1->vec[0]) < 0.00001f) {




More information about the Bf-blender-cvs mailing list