diff --git a/lib/irrlicht/source/Irrlicht/CGUIButton.cpp b/lib/irrlicht/source/Irrlicht/CGUIButton.cpp index d4e6d9a91..74c335a35 100644 --- a/lib/irrlicht/source/Irrlicht/CGUIButton.cpp +++ b/lib/irrlicht/source/Irrlicht/CGUIButton.cpp @@ -277,7 +277,7 @@ void CGUIButton::draw() pos.X += skin->getSize(EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X); pos.Y += skin->getSize(EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y); } - driver->draw2DImage(PressedImage, + skin->draw2DImage(PressedImage, ScaleImage? AbsoluteRect : core::recti(pos, PressedImageRect.getSize()), PressedImageRect, &AbsoluteClippingRect, diff --git a/lib/irrlicht/source/Irrlicht/CGUIImage.cpp b/lib/irrlicht/source/Irrlicht/CGUIImage.cpp index 17d30e0ec..184a6e5cc 100644 --- a/lib/irrlicht/source/Irrlicht/CGUIImage.cpp +++ b/lib/irrlicht/source/Irrlicht/CGUIImage.cpp @@ -78,20 +78,20 @@ void CGUIImage::draw() if (Texture) { - if (ScaleImage) - { + //if (ScaleImage) + //{ const video::SColor Colors[] = {Color,Color,Color,Color}; - driver->draw2DImage(Texture, AbsoluteRect, + skin->draw2DImage(Texture, AbsoluteRect, core::rect(core::position2d(0,0), core::dimension2di(Texture->getOriginalSize())), &AbsoluteClippingRect, Colors, UseAlphaChannel); - } - else - { - driver->draw2DImage(Texture, AbsoluteRect.UpperLeftCorner, - core::rect(core::position2d(0,0), core::dimension2di(Texture->getOriginalSize())), - &AbsoluteClippingRect, Color, UseAlphaChannel); - } + //} + //else + //{ + // driver->draw2DImage(Texture, AbsoluteRect.UpperLeftCorner, + // core::rect(core::position2d(0,0), core::dimension2di(Texture->getOriginalSize())), + // &AbsoluteClippingRect, Color, UseAlphaChannel); + //} } else {