From 901b917d37f229fd45a4126fe7638772a6333485 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Tue, 6 Aug 2013 23:15:22 +0200
Subject: [PATCH] Fixed Color::operator+ and operator*

Thanks to Overdrivr


Former-commit-id: 696e2a35f4e0243577a56feeb16e2268f25290d3
---
 include/Nazara/Core/Color.inl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/Nazara/Core/Color.inl b/include/Nazara/Core/Color.inl
index a205509ee..9640aaaf2 100644
--- a/include/Nazara/Core/Color.inl
+++ b/include/Nazara/Core/Color.inl
@@ -52,17 +52,17 @@ inline NzString NzColor::ToString() const
 inline NzColor NzColor::operator+(const NzColor& color) const
 {
 	return NzColor(std::min(static_cast<nzUInt16>(r) + color.r, 255),
-	               std::min(static_cast<nzUInt16>(r) + color.r, 255),
-				   std::min(static_cast<nzUInt16>(r) + color.r, 255),
-	               std::min(static_cast<nzUInt16>(r) + color.r, 255));
+	               std::min(static_cast<nzUInt16>(g) + color.g, 255),
+	               std::min(static_cast<nzUInt16>(b) + color.b, 255),
+	               std::min(static_cast<nzUInt16>(a) + color.a, 255));
 }
 
 inline NzColor NzColor::operator*(const NzColor& color) const
 {
 	return NzColor(static_cast<nzUInt16>(r) * color.r/255,
-	               static_cast<nzUInt16>(r) * color.r/255,
-				   static_cast<nzUInt16>(r) * color.r/255,
-	               static_cast<nzUInt16>(r) * color.r/255);
+	               static_cast<nzUInt16>(g) * color.g/255,
+	               static_cast<nzUInt16>(b) * color.b/255,
+	               static_cast<nzUInt16>(a) * color.a/255);
 }
 
 inline NzColor NzColor::operator+=(const NzColor& color)