Yes, that's what it looks like. I would do one polygon per building. It also makes debugging and editing a LOT easier.
