Merge remote-tracking branch 'upstream/master'

This commit is contained in:
James B. Pollack 2015-10-05 10:06:41 -07:00
commit 2e293718fc

View file

@ -85,6 +85,11 @@
particleRadius: 0.01,
radiusSpread: 0.005,
polarFinish: 0.05,
colorStart: {
red: 50,
green: 10,
blue: 150
},
color: {
red: 170,
green: 20,
@ -155,8 +160,5 @@
if (this.paintStream) {
Entities.deleteEntity(this.paintStream);
}
this.strokes.forEach(function(stroke) {
Entities.deleteEntity(stroke);
});
}
});