From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 17 Dec 2015 00:39:15 +0000 (+0000)
Subject: filamentspool: Fix a bug in dove version introduced with nondove: difference() scope... 
X-Git-Tag: filamentspool-v2-release~66
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=commitdiff_plain;h=76a08f242fb141b3c7616e2a7d48eb9cc1e50510;ds=sidebyside

filamentspool: Fix a bug in dove version introduced with nondove: difference() scope was broken
---

diff --git a/filamentspool.scad b/filamentspool.scad
index b28ccac..bb3c678 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -289,8 +289,8 @@ module Hub(){ ////toplevel
       cylinder(h=hubaxlelen, r=axlerad+hublwidth);
       for (ang=[0 : 360/num_arms : 359])
 	rotate([0,0,ang]) {
-	  difference() {
-	    if (usedove()){
+	  if (usedove()){
+	    difference() {
 	      translate([hubeffrad,0,0])
 		DoveClipPairSane(h=doveclipheight,
 				 baseextend = (hubeffrad - DoveClip_depth()
@@ -299,25 +299,25 @@ module Hub(){ ////toplevel
 		translate([hubbigrad + hublwidth, -holewidth/2, -1])
 		  cube([hole, holewidth, hublthick+2]);
 	      }
-	    } else {
-	      difference(){
-		translate([0,
-			   -nondove_allwidth/2,
-			   0])
-		  cube([hubeffrad + nondove_armhole_x
-			+ nondove_armhole_hole/2 + nondove_armhole_support,
-			nondove_allwidth,
-			nondove_armhole_wall + totalheight]);
-		translate([hubeffrad - nondove_armhole_slop_x,
-			   -nondove_allwidth/2
-			   + nondove_armhole_wall - nondove_armhole_slop,
-			   nondove_armhole_wall])
-		  cube([nondove_armhole_x + 50,
-			totalwidth + nondove_armhole_slop*2,
-			totalheight + 1]);
-		translate([hubeffrad + nondove_armhole_x, 0, -20])
-		   cylinder(r= nondove_armhole_hole/2, h=50, $fn=10);
-	      }
+	    }
+	  } else {
+	    difference(){
+	      translate([0,
+			 -nondove_allwidth/2,
+			 0])
+		cube([hubeffrad + nondove_armhole_x
+		      + nondove_armhole_hole/2 + nondove_armhole_support,
+		      nondove_allwidth,
+		      nondove_armhole_wall + totalheight]);
+	      translate([hubeffrad - nondove_armhole_slop_x,
+			 -nondove_allwidth/2
+			 + nondove_armhole_wall - nondove_armhole_slop,
+			 nondove_armhole_wall])
+		cube([nondove_armhole_x + 50,
+		      totalwidth + nondove_armhole_slop*2,
+		      totalheight + 1]);
+	      translate([hubeffrad + nondove_armhole_x, 0, -20])
+		cylinder(r= nondove_armhole_hole/2, h=50, $fn=10);
 	    }
 	  }
 	}