Fix two dimensional renderer to once again use objects.