Small improvements to material reuse of Spritemap