Merge branch 'master' of https://github.com/supertuxkart/stk-code

2014-11-10 12:59:27 +01:00 · 2014-11-10 12:59:27 +01:00 · 517c828738
commit 517c828738
parent 322dec5419 b6b4636861
1 changed files with 2 additions and 1 deletions
--- a/src/guiengine/widgets/icon_button_widget.cpp
+++ b/src/guiengine/widgets/icon_button_widget.cpp
@ -296,7 +296,8 @@ video::ITexture* IconButtonWidget::getDeactivatedTexture(video::ITexture* textur

    std::string name = texture->getName().getPath().c_str();
    name += "_disabled";
-    t = irr_driver->getTexture(name);
+    t = irr_driver->getTexture(name, /*premul*/false, /*prediv*/false, 
+                                     /*compain_if_not_found*/false);
    if (t == NULL)
    {
        SColor c;