ecc3656f72
Overall the transition to C++ in the draw module is awkwardly half complete, but moving more code to a C++ namespace makes cleaning up this code in other ways much easier, and the next C++ cleanup steps are clear anyway.