Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -166,7 +166,6 @@ int CIconManager::GetIconTexture(const char* iconName)
            if (QString::compare(ext, "bmp", Qt::CaseInsensitive) == 0 || QString::compare(ext, "jpg", Qt::CaseInsensitive) == 0)
            {
                int sz = image.GetWidth() * image.GetHeight();
-                int h = image.GetHeight();
                uint8* buf = (uint8*)image.GetData();
                for (int i = 0; i < sz; i++)
                {