From 1d84b10b3ec24263151d25bc66410d846ca6d9d5 Mon Sep 17 00:00:00 2001
From: Nicolay Korslund <korslund@gmail.com>
Date: Fri, 25 Jun 2010 15:23:21 +0200
Subject: [PATCH] fixed more warning messages, updated mangle

---
 mangle                      |  2 +-
 nifogre/ogre_nif_loader.cpp | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/mangle b/mangle
index 6b0b7c95f8..19649bfeaa 160000
--- a/mangle
+++ b/mangle
@@ -1 +1 @@
-Subproject commit 6b0b7c95f8a40a53b4c26d551d4fb5118deb7e12
+Subproject commit 19649bfeaa5a204cc765c7b0a66789919d6681d9
diff --git a/nifogre/ogre_nif_loader.cpp b/nifogre/ogre_nif_loader.cpp
index ba88e86ae5..3c4ac19e01 100644
--- a/nifogre/ogre_nif_loader.cpp
+++ b/nifogre/ogre_nif_loader.cpp
@@ -134,7 +134,8 @@ public:
   float maxZ() { return Z.max; }
 };
 
-// Conversion of blend / test mode from NIF -> OGRE. Not in use yet.
+// Conversion of blend / test mode from NIF -> OGRE.
+/* Not in use yet, so let's comment it out.
 static SceneBlendFactor getBlendFactor(int mode)
 {
   switch(mode)
@@ -149,14 +150,15 @@ static SceneBlendFactor getBlendFactor(int mode)
     case 7: return SBF_ONE_MINUS_SOURCE_ALPHA;
     case 8: return SBF_DEST_ALPHA;
     case 9: return SBF_ONE_MINUS_DEST_ALPHA;
-    /* [Comment from Chris Robinson:] Can't handle this mode? :/
-    case 10: return SBF_SOURCE_ALPHA_SATURATE;
-    */
+      // [Comment from Chris Robinson:] Can't handle this mode? :/
+      // case 10: return SBF_SOURCE_ALPHA_SATURATE;
     default:
       return SBF_SOURCE_ALPHA;
     }
 }
+*/
 
+/* This is also unused
 static CompareFunction getTestMode(int mode)
 {
   switch(mode)
@@ -173,6 +175,7 @@ static CompareFunction getTestMode(int mode)
       return CMPF_ALWAYS_PASS;
     }
 }
+*/
 
 static void createMaterial(const String &name,
                            const Vector &ambient,