From ed6224024ee603ae5cd7ba910691858549d38388 Mon Sep 17 00:00:00 2001 From: clifford Date: Tue, 30 Jun 2009 18:19:57 +0000 Subject: Clifford Wolf: Fixed cylinder primitive with r1 = 0 or r2 = 0 for CGAL git-svn-id: http://svn.clifford.at/openscad/trunk@40 b57f626f-c46c-0410-a088-ec61d464b74c diff --git a/primitives.cc b/primitives.cc index ae43a58..6954e87 100644 --- a/primitives.cc +++ b/primitives.cc @@ -294,14 +294,18 @@ sphere_next_r2: for (int i=0; iappend_poly(); - p->insert_vertex(circle1[i].x, circle1[i].y, z1); - p->insert_vertex(circle2[i].x, circle2[i].y, z2); - p->insert_vertex(circle1[j].x, circle1[j].y, z1); - p->append_poly(); - p->insert_vertex(circle2[i].x, circle2[i].y, z2); - p->insert_vertex(circle2[j].x, circle2[j].y, z2); - p->insert_vertex(circle1[j].x, circle1[j].y, z1); + if (r1 > 0) { + p->append_poly(); + p->insert_vertex(circle1[i].x, circle1[i].y, z1); + p->insert_vertex(circle2[i].x, circle2[i].y, z2); + p->insert_vertex(circle1[j].x, circle1[j].y, z1); + } + if (r2 > 0) { + p->append_poly(); + p->insert_vertex(circle2[i].x, circle2[i].y, z2); + p->insert_vertex(circle2[j].x, circle2[j].y, z2); + p->insert_vertex(circle1[j].x, circle1[j].y, z1); + } } if (r1 > 0) { -- cgit v0.10.1