From dc2332fa528b9cf161c30d0a204af98deddc7814 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Tue, 25 Oct 2011 22:18:35 +0300 Subject: [PATCH] Revert "Show an empty icon (transparent 16x16) in item stats if an attribute icon is missing from static data or things are screwed up" This reverts commit 4560533b2a3a1e6770c340629aca0c7da2c12f41. --- gui/itemStats.py | 7 +------ staticdata | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/gui/itemStats.py b/gui/itemStats.py index 32c864ad7..b2b648468 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -302,12 +302,7 @@ class ItemParams (wx.Panel): if info: if info.icon is not None: iconFile = info.icon.iconFile - icon = bitmapLoader.getBitmap(iconFile, "pack") - - if icon is None: - icon = bitmapLoader.getBitmap("transparent16x16", "icons") - - attrIcon = self.imageList.Add( icon ) + attrIcon = self.imageList.Add(bitmapLoader.getBitmap(iconFile, "pack")) else: attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "pack")) else: diff --git a/staticdata b/staticdata index 7e1bdbf65..6203f5129 160000 --- a/staticdata +++ b/staticdata @@ -1 +1 @@ -Subproject commit 7e1bdbf653dc79d79d85d1188fb3934a68ca3525 +Subproject commit 6203f512935717762b0e7770ffec5cb9f32f5107