got rid of brushDirty, which I'm 90% sure we weren't using
Merge branch 'legend'