Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Shape::setTextureRect not working when called before setTexture

Browse Source
This commit is contained in:
Laurent Gomila 2013-05-01 09:50:57 +02:00
parent 86897a8347
commit 323aa4e3e7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/SFML/Graphics/Shape.cpp
View File

@ -63,9 +63,12 @@ Shape::~Shape()
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void Shape::setTexture(const Texture* texture, bool resetRect) void Shape::setTexture(const Texture* texture, bool resetRect)
{ {
// Recompute the texture area if requested, or if there was no texture before if (texture)
if (texture && (resetRect || !m_texture)) {
// Recompute the texture area if requested, or if there was no texture & rect before
if (resetRect || (!m_texture && (m_textureRect == sf::IntRect())))
setTextureRect(IntRect(0, 0, texture->getSize().x, texture->getSize().y)); setTextureRect(IntRect(0, 0, texture->getSize().x, texture->getSize().y));
}
// Assign the new texture // Assign the new texture
m_texture = texture; m_texture = texture;