From 9e3a7626fc5c86e09822806e84c5342d332867f7 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: 790b49278d8cf7c1800f559cf0d29d65d0834b08 [formerly 93b247cc3433a5ac7c0f5a5ef48b0cf7a0c0f9dc] [formerly 9d6210ac2449aa5dc0d74d9a3cb256480e095008 [formerly 4ccda8249177b9ba5daa5406fd57f17b483cd81c]]
Former-commit-id: 22dcc8245a3ec0774c1723f88682c585a43ff3c7 [formerly 94bbee0ec1e3fb904d83258da52b8f90634f4c8a]
Former-commit-id: a8326b7bec2c16837b1340de8edd5c731ec837ec
---
 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;