Last Commit before changing to GL rendering