Merge remote-tracking branch 'refs/remotes/origin/master' into gui

2016-11-30 13:08:08 +01:00
parent 3d79db4c52 6ebbf882f3
commit e6e4a437bd
227 changed files with 9347 additions and 4815 deletions
--- a/src/Nazara/Graphics/TextSprite.cpp
+++ b/src/Nazara/Graphics/TextSprite.cpp
@@ -202,8 +202,8 @@ namespace Nz
 	void TextSprite::MakeBoundingVolume() const
 	{
 		Rectf bounds(m_localBounds);
-		Vector2f max = bounds.GetMaximum();
-		Vector2f min = bounds.GetMinimum();
+		Vector2f max = m_scale * bounds.GetMaximum();
+		Vector2f min = m_scale * bounds.GetMinimum();

 		m_boundingVolume.Set(min.x * Vector3f::Right() + min.y * Vector3f::Down(), max.x * Vector3f::Right() + max.y * Vector3f::Down());
 	}