Cleanup

skyjake · Feb 27, 2013 · 3a75f99 · 3a75f99
1 parent aebf710
commit 3a75f99
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/doomsday/client/src/def_main.cpp b/doomsday/client/src/def_main.cpp
@@ -899,7 +899,7 @@ static void readAllDefinitions()
      */
     Def_ReadLumpDefs();
 
-    LOG_INFO(String("readAllDefinitions: Done in %1 seconds.").arg(begunAt.since(), 0, 'g', 2));
+    LOG_INFO(String("readAllDefinitions: Completed in %1 seconds.").arg(begunAt.since(), 0, 'g', 2));
 }
 
 static animgroup_t const *findAnimGroupForTexture(TextureManifest &manifest)

diff --git a/doomsday/client/src/resource/material.cpp b/doomsday/client/src/resource/material.cpp
@@ -642,12 +642,14 @@ void Material::markValid(bool yes)
 
 String Material::composeDescription() const
 {
-    String str = String("Material \"%1\" [%2]")
-                     .arg(manifest().composeUri().asText())
-                     .arg(de::dintptr(this))
-               + " Dimensions:" + (width() == 0 && height() == 0? String("unknown (not yet prepared)")
-                                                                : String("(%1 x %2)").arg(width()).arg(height()))
-               + " Source:" + manifest().sourceDescription();
+    String str = String("Material \"%1\"").arg(manifest().composeUri().asText());
+#ifdef DENG_DEBUG
+    str += String(" [%2]").arg(de::dintptr(this));
+#endif
+    str += " Dimensions:"
+        +  (width() == 0 && height() == 0? String("unknown (not yet prepared)")
+                                         : dimensions().asText())
+        +  " Source:" + manifest().sourceDescription();
 #ifdef __CLIENT__
     str += String(" x%1").arg(variantCount());
 #endif