vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed merge error

customizer
Marius Kintel 2014-01-13 23:08:43 -05:00
parent 0ea3c831dd
commit 389e95e374
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/primitives.cc
View File

@ -433,8 +433,9 @@ Geometry *PrimitiveNode::createGeometry() const
case CYLINDER: {
PolySet *p = new PolySet(3);
g = p;
if (this->h > 0 && this->r1 >=0 && this->r2 >= 0 && (this->r1 > 0 || this->r2 > 0) &&
!isinf(this->r1) && !isinf(this->r2)) {
if (this->h > 0 && !isinf(this->h) &&
this->r1 >=0 && this->r2 >= 0 && (this->r1 > 0 || this->r2 > 0) &&
!isinf(this->r1) && !isinf(this->r2)) {
int fragments = Calc::get_fragments_from_r(fmax(this->r1, this->r2), this->fn, this->fs, this->fa);
double z1, z2;