Fix flicker, and prevent intensity from changing mid-render
Merge branch 'master' of github.com:UMLComputerGraphics/GraphicsProject