From 4520020f3baa59c35b46eb0f4bf6f74f1c430c4c Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Tue, 5 Jan 2016 17:12:29 +0100
Subject: [PATCH] Merge with develop

---
 code/nel/tools/3d/panoply_maker/panoply_maker.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/nel/tools/3d/panoply_maker/panoply_maker.cpp b/code/nel/tools/3d/panoply_maker/panoply_maker.cpp
index 328639eb6..2c50dfc83 100644
--- a/code/nel/tools/3d/panoply_maker/panoply_maker.cpp
+++ b/code/nel/tools/3d/panoply_maker/panoply_maker.cpp
@@ -656,6 +656,9 @@ static void BuildColoredVersionForOneBitmap(const CBuildInfo &bi, const std::str
 		{
 			if (is.open(fullInputBitmapPath))
 			{
+				// 8 bits textures are grayscale
+				srcBitmap.loadGrayscaleAsAlpha(false);
+
 				depth = srcBitmap.load(is);
 				is.close();