Merge branch 'master' of github.com:vanderlin/Tools

Conflicts: Utils/Utils.h
vanderlin · Mar 23, 2012 · a4a4ed7 · a4a4ed7
2 parents 0217c50 + 87efb9e
commit a4a4ed7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Utils/Utils.h b/Utils/Utils.h
@@ -80,9 +80,10 @@ static float isPointInScreen(const ofVec2f &pt, float padding=0) {
     ofRectangle screen(-padding, -padding, ofGetWidth()+(padding*2), ofGetHeight()+(padding*2)); 
     return screen.inside(pt);
 }
+/*
 static float isPointInScreen(float x, float y, float padding=0) {
     return isPointInScreen(x, y);
-}
+}*/
 
 static ofVec2f ofRandomPointInRect(float x, float y, float w, float h, float padding=0) {
     float rx = ofRandom(x+padding, x+(w-padding*2));