From 6d5eb79804b26a5f8f586f238d19161542030c03 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 9 Dec 2003 12:05:50 +0000
Subject: [PATCH] Addition of Mode mode=MODULATE constructor.

---
 include/osg/TexEnv | 17 +++++++++--------
 src/osg/TexEnv.cpp |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/include/osg/TexEnv b/include/osg/TexEnv
index 2f669d35c..a4ad20363 100644
--- a/include/osg/TexEnv
+++ b/include/osg/TexEnv
@@ -25,7 +25,15 @@ class SG_EXPORT TexEnv : public StateAttribute
 {
     public :
 
-        TexEnv();
+        enum Mode {
+            DECAL     = GL_DECAL,
+            MODULATE  = GL_MODULATE,
+            BLEND     = GL_BLEND,
+            REPLACE   = GL_REPLACE,
+            ADD       = GL_ADD
+        };
+
+        TexEnv(Mode mode=MODULATE);
         
         /** Copy constructor using CopyOp to manage deep vs shallow copy.*/
         TexEnv(const TexEnv& texenv,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
@@ -52,13 +60,6 @@ class SG_EXPORT TexEnv : public StateAttribute
             return 0; // passed all the above comparison macro's, must be equal.
         }
 
-        enum Mode {
-            DECAL     = GL_DECAL,
-            MODULATE  = GL_MODULATE,
-            BLEND     = GL_BLEND,
-            REPLACE   = GL_REPLACE,
-            ADD       = GL_ADD
-        };
 
         void setMode( Mode mode ) { _mode = mode; }
         
diff --git a/src/osg/TexEnv.cpp b/src/osg/TexEnv.cpp
index 67a11bc6c..50f25bf20 100644
--- a/src/osg/TexEnv.cpp
+++ b/src/osg/TexEnv.cpp
@@ -15,9 +15,9 @@
 
 using namespace osg;
 
-TexEnv::TexEnv()
+TexEnv::TexEnv(Mode mode)
 {
-    _mode = MODULATE;
+    _mode = mode;
     _color.set(0.0f,0.0f,0.0f,0.0f);
 }