Trying out gman's advice
Trying to make texture buffers work on a per-shape basis, when there are multiple shapes on the canvas
Merged origin/master