Reworked scatter to use point clipping instead of line clipping
Merge remote-tracking branch 'upstream/master' into jp1306
Merge pull request #1368 from jaypoulz/jp1306

Jp1306 -- Scatter now uses point clipping instead of line clipping