1 files changed, 3 insertions, 14 deletions

diff --git a/js/ui/controls.js b/js/ui/controls.js
index c4c7f30..b5ed6b1 100644
--- a/js/ui/controls.js
+++ b/js/ui/controls.js
@@ -4,44 +4,33 @@ var controls = (function(){
 
   controls.cross = new Tool (cross_el)
   controls.cross.use = function(){
-    brush.generate = controls.cross.generate
+		brush.mask = blit.cross
     brush.generate()
     drawing = true
     brush.modified = false
   }
-  controls.cross.generate = function(){
-    brush.fill(brush)
-    blit.cross(brush)
-  }
   controls.cross.done = function(){
     drawing = false
   }
 
   controls.circle = new Tool (circle_el)
   controls.circle.use = function(){
-    brush.generate = controls.circle.generate
+		brush.mask = blit.circle
     brush.generate()
     drawing = true
     brush.modified = false
   }
-  controls.circle.generate = function(){
-    brush.fill(brush)
-    blit.circle(brush)
-  }
   controls.circle.done = function(){
     drawing = false
   }
   
   controls.square = new Tool (square_el)
   controls.square.use = function(){
-    brush.generate = controls.square.generate
+		brush.mask = blit.square
     brush.generate()
     brush.modified = false
     drawing = true
   }
-  controls.square.generate = function(){
-    brush.fill(brush)
-  }
   controls.square.done = function(){
     drawing = false
   }