Changeset 13041 for OpenSceneGraph/trunk/src/osg/TexEnvCombine.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osg/TexEnvCombine.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/src/osg/TexEnvCombine.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -58 +58 @@
         isGLExtensionSupported(contextID,"GL_NV_texture_env_combine4");
 
-    static bool s_isTexEnvDot3Supported = 
+    static bool s_isTexEnvDot3Supported =
         isGLExtensionSupported(contextID,"GL_ARB_texture_env_dot3");
 
@@ -74 +74 @@
 
         glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, _combine_RGB);
-        
+
         if (_combine_RGB!=DOT3_RGBA)
             glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, _combine_Alpha);
@@ -142 +142 @@
 }
 void TexEnvCombine::setOperand2_Alpha(GLint op)
-{ 
+{
     _operand2_Alpha = Valid_Operand_Alpha(op,"setOperand2_Alpha");
 }