merge

2026-11-03 16:40:21 +01:00 · 2017-02-26 19:10:16 +01:00
parent fcf74abfa2 79e2db387f
commit bd9cd6f797
32 changed files with 2301 additions and 911 deletions
--- a/Texture.h
+++ b/Texture.h
@@ -103,5 +103,3 @@ private:
    index_map m_texturemappings;
    size_type m_activetexture{ 0 }; // last i.e. currently bound texture
 };
-
-extern texture_manager TextureManager;