Merge with develop

--HG-- branch : compatibility-develop
8 years ago · b95fed61f2
parent f069df82b3 254c7690f8
commit b95fed61f2
2 changed files with 2 additions and 8 deletions
--- a/code/nel/src/gui/ctrl_button.cpp
+++ b/code/nel/src/gui/ctrl_button.cpp
@ -446,10 +446,7 @@ namespace NLGUI
 	// ***************************************************************************
 	sint32	CCtrlButton::getMaxUsedW() const
 	{
-		sint32 txw, txh;
-		CViewRenderer &rVR = *CViewRenderer::getInstance();
-		rVR.getTextureSizeFromId (_TextureIdNormal, txw, txh);
-		return txw;
+		return _W;
 	}

 	// ***************************************************************************
--- a/code/nel/src/gui/view_bitmap.cpp
+++ b/code/nel/src/gui/view_bitmap.cpp
@ -511,10 +511,7 @@ namespace NLGUI
 	// ***************************************************************************
 	sint32	CViewBitmap::getMaxUsedW() const
 	{
-		sint32 txw, txh;
-		CViewRenderer &rVR = *CViewRenderer::getInstance();
-		rVR.getTextureSizeFromId (_TextureId, txw, txh);
-		return txw;
+		return _W;
 	}

 	// ***************************************************************************