Fix 2d mode flat textures not updating sometimes on undo
Focus the map canvas when entering 3d mode via the toolbar button
Merge branch 'master' of https://github.com/sirjuddington/SLADE into Music