Before MSAA merge
Merge branch 'master' of https://github.com/olekristensen/Trae

# By Johan Bichel Lindegaard
# Via Johan Bichel Lindegaard
* 'master' of https://github.com/olekristensen/Trae:
  Antialiasing on FBOs
Before preview show state #1
Adjusted ring animations. Before preview state #2.