Merged VBO renderer fixes.

High wpoly maps should be fine now.