Cleanup - use pointer-type and type-name in vectors wherever possible
uniform_material_class is entity_material_category