From d7944e839b09b620b1d6c5af248208b4c01d7ae6 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 17 Apr 2006 10:44:02 +0000
Subject: Since we define alpha value 255 to mean 'opaque', or T::kAlphaMask
 into the result of RGBToColor

svn-id: r21968
---
 graphics/colormasks.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'graphics')

diff --git a/graphics/colormasks.h b/graphics/colormasks.h
index 2e151fc67b..06a791c50d 100644
--- a/graphics/colormasks.h
+++ b/graphics/colormasks.h
@@ -219,7 +219,8 @@ struct ColorMasks<8888> {
 
 template<class T>
 uint32 RGBToColor(uint8 r, uint8 g, uint8 b) {
-	return ((r << T::kRedShift) & T::kRedMask) |
+	return T::kAlphaMask |
+	       ((r << T::kRedShift) & T::kRedMask) |
 	       ((g << T::kGreenShift) & T::kGreenMask) |
 	       ((b << T::kBlueShift) & T::kBlueMask);
 }
-- 
cgit v1.2.3