ResourceSystem: Cleanup

skyjake · Dec 10, 2013 · 895b4f7 · 895b4f7
1 parent 3a98e53
commit 895b4f7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/doomsday/client/src/dd_main.cpp b/doomsday/client/src/dd_main.cpp
@@ -1727,6 +1727,8 @@ boolean DD_Init(void)
 #ifdef __CLIENT__
     GL_Init();
     GL_InitRefresh();
+    App_ResourceSystem().clearAllTextureSpecs();
+    App_ResourceSystem().initSystemTextures();
     LensFx_Init();
 #endif
 
@@ -2102,6 +2104,8 @@ static int DD_UpdateEngineStateWorker(void *context)
     if(!novideo)
     {
         GL_InitRefresh();
+        App_ResourceSystem().clearAllTextureSpecs();
+        App_ResourceSystem().initSystemTextures();
     }
 #endif
 

diff --git a/doomsday/client/src/gl/gl_main.cpp b/doomsday/client/src/gl/gl_main.cpp
@@ -364,21 +364,15 @@ void GL_Init()
 void GL_InitRefresh()
 {
     if(novideo) return;
-    GL_InitTextureManager();
-    App_ResourceSystem().clearAllTextureSpecs();
 
-    // Register/create Texture objects for the system textures.
-    App_ResourceSystem().initSystemTextures();
+    GL_InitTextureManager();
 
     initFullGLOk = true;
 }
 
 void GL_ShutdownRefresh()
 {
     initFullGLOk = false;
-
-    App_ResourceSystem().clearAllColorPalettes();
-    App_ResourceSystem().clearAllTextureSpecs();
 }
 
 void GL_Shutdown()

diff --git a/doomsday/client/src/resource/resourcesystem.cpp b/doomsday/client/src/resource/resourcesystem.cpp
@@ -396,13 +396,15 @@ DENG2_PIMPL(ResourceSystem)
         clearMaterialManifests();
 
 #ifdef __CLIENT__
+        clearAllTextureSpecs();
         clearMaterialSpecs();
 #endif
 
         clearSprites();
 #ifdef __CLIENT__
         clearModels();
 #endif
+        self.clearAllColorPalettes();
     }
 
     inline de::FS1 &fileSystem()