From cfba75812d3b5f11ee7b2f965208dd0ef6650bf9 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Thu, 1 Sep 2016 21:07:08 +0200
Subject: [PATCH] Graphics/Sprite: Fix origin not being initialized/copied

Former-commit-id: 2d97bcc693f4883f7ef0dea00ae6f3570ff50799 [formerly 6cd28f90af1105bf9dec88e61b1d483091fdcece] [formerly 9a1b25d55141a14c95e119dd8afbecca9fe25bcd [formerly b680a62e0d73cc74e47ec5c0768f5b5f7f655f68]]
Former-commit-id: 9695deaf671680614ab8c0af81ac468867474f77 [formerly 3743b8d8a6bc9585cabcda5e7462b0284e653f5f]
Former-commit-id: b0a32e045549e4abb52c9c0b3a933ace3ab7fbef
---
 include/Nazara/Graphics/Sprite.inl | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/include/Nazara/Graphics/Sprite.inl b/include/Nazara/Graphics/Sprite.inl
index 2cfc014a2..410b42478 100644
--- a/include/Nazara/Graphics/Sprite.inl
+++ b/include/Nazara/Graphics/Sprite.inl
@@ -14,9 +14,9 @@ namespace Nz
 
 	inline Sprite::Sprite() :
 	m_color(Color::White),
-	m_origin(Nz::Vector3f::Zero()),
 	m_textureCoords(0.f, 0.f, 1.f, 1.f),
-	m_size(64.f, 64.f)
+	m_size(64.f, 64.f),
+	m_origin(Nz::Vector3f::Zero())
 	{
 		SetDefaultMaterial();
 	}
@@ -26,11 +26,8 @@ namespace Nz
 	*
 	* \param material Reference to a material
 	*/
-
 	inline Sprite::Sprite(MaterialRef material) :
-	m_color(Color::White),
-	m_textureCoords(0.f, 0.f, 1.f, 1.f),
-	m_size(64.f, 64.f)
+	Sprite()
 	{
 		SetMaterial(std::move(material), true);
 	}
@@ -42,9 +39,7 @@ namespace Nz
 	*/
 
 	inline Sprite::Sprite(Texture* texture) :
-	m_color(Color::White),
-	m_textureCoords(0.f, 0.f, 1.f, 1.f),
-	m_size(64.f, 64.f)
+	Sprite()
 	{
 		SetTexture(texture, true);
 	}
@@ -60,7 +55,8 @@ namespace Nz
 	m_color(sprite.m_color),
 	m_material(sprite.m_material),
 	m_textureCoords(sprite.m_textureCoords),
-	m_size(sprite.m_size)
+	m_size(sprite.m_size),
+	m_origin(sprite.m_origin)
 	{
 	}
 
@@ -270,6 +266,7 @@ namespace Nz
 
 		m_color = sprite.m_color;
 		m_material = sprite.m_material;
+		m_origin = sprite.m_origin;
 		m_textureCoords = sprite.m_textureCoords;
 		m_size = sprite.m_size;