Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine

2018-07-15 16:46:34 +02:00
parent a12c72186f 58ce182983
commit f2487bbcba
3 changed files with 35 additions and 2 deletions
--- a/include/Nazara/Graphics/Sprite.inl
+++ b/include/Nazara/Graphics/Sprite.inl
@@ -280,8 +280,10 @@ namespace Nz
 		else
 		{
 			material->SetDiffuseMap(std::move(texture));
-			if (resizeSprite && texture && texture->IsValid())
-				SetSize(Vector2f(Vector2ui(texture->GetSize())));
+			const TextureRef& newTexture = material->GetDiffuseMap();
+
+			if (resizeSprite && newTexture && newTexture->IsValid())
+				SetSize(Vector2f(Vector2ui(newTexture->GetSize())));
 		}
 	}