Switched to using Uniform Blocks for Materials

functionality partially restored.