Refactor: Renamed Materials_DeleteGLTextures to Materials_ReleaseGLTe…

…xtures inline with naming conventions used elsewhere.
skyjake · Jul 16, 2011 · 644a646 · 644a646
1 parent 0e77b9e
commit 644a646
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/doomsday/engine/portable/include/p_materialmanager.h b/doomsday/engine/portable/include/p_materialmanager.h
@@ -35,9 +35,6 @@ struct material_snapshot_s;
 
 void P_MaterialsRegister(void);
 
-/**
- * One time initialization of the materials list.
- */
 void Materials_Initialize(void);
 
 /**
@@ -82,7 +79,7 @@ void Materials_Precache(struct material_s* mat, struct materialvariantspecificat
  * @param mnamespace @c MN_ANY = delete everything, ELSE
  *      Only delete those currently in use by materials in the specified namespace.
  */
-void Materials_DeleteGLTextures(const char* namespaceName);
+void Materials_ReleaseGLTextures(const char* namespaceName);
 
 void Materials_Ticker(timespan_t elapsed);
 

diff --git a/doomsday/engine/portable/src/gl_texmanager.c b/doomsday/engine/portable/src/gl_texmanager.c
@@ -1376,7 +1376,7 @@ void GL_ReleaseSystemTextures(void)
     }
     memset(sysFlareTextures, 0, sizeof(sysFlareTextures));
 
-    Materials_DeleteGLTextures(MN_SYSTEM_NAME);
+    Materials_ReleaseGLTextures(MN_SYSTEM_NAME);
     UI_ReleaseTextures();
 
     Rend_ParticleReleaseSystemTextures();

diff --git a/doomsday/engine/portable/src/p_materialmanager.c b/doomsday/engine/portable/src/p_materialmanager.c
@@ -725,7 +725,7 @@ static void releaseGLTexturesForMaterial(material_t* mat)
     Material_IterateVariants(mat, releaseGLTexturesForMaterialWorker, NULL);
 }
 
-void Materials_DeleteGLTextures(const char* namespaceName)
+void Materials_ReleaseGLTextures(const char* namespaceName)
 {
     materialnamespaceid_t namespaceId = MN_ANY;
 
@@ -735,7 +735,7 @@ void Materials_DeleteGLTextures(const char* namespaceName)
         if(!VALID_MATERIALNAMESPACEID(namespaceId))
         {
 #if _DEBUG
-            Con_Message("Warning:Materials_DeleteGLTextures: Attempt to delete in "
+            Con_Message("Warning:Materials_ReleaseGLTextures: Attempt to delete in "
                 "unknown namespace (%s), ignoring.\n", namespaceName);
 #endif
             return;
@@ -749,7 +749,7 @@ void Materials_DeleteGLTextures(const char* namespaceName)
     }
 
     if(!VALID_MATERIALNAMESPACEID(namespaceId))
-        Con_Error("Materials_DeleteGLTextures: Internal error, "
+        Con_Error("Materials_ReleaseGLTextures: Internal error, "
                   "invalid materialgroup '%i'.", (int) namespaceId);
 
     if(bindings)