Show
Ignore:
Timestamp:
03/21/12 18:36:20 (3 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osg/TexEnvCombine.cpp

    r11472 r13041  
    1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield  
     1/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
    22 * 
    3  * This library is open source and may be redistributed and/or modified under   
    4  * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or  
     3 * This library is open source and may be redistributed and/or modified under 
     4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
    55 * (at your option) any later version.  The full license is in LICENSE file 
    66 * included with this distribution, and on the openscenegraph.org website. 
    7  *  
     7 * 
    88 * This library is distributed in the hope that it will be useful, 
    99 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    10  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
     10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1111 * OpenSceneGraph Public License for more details. 
    1212*/ 
     
    5858        isGLExtensionSupported(contextID,"GL_NV_texture_env_combine4"); 
    5959 
    60     static bool s_isTexEnvDot3Supported =  
     60    static bool s_isTexEnvDot3Supported = 
    6161        isGLExtensionSupported(contextID,"GL_ARB_texture_env_dot3"); 
    6262 
     
    7474 
    7575        glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, _combine_RGB); 
    76          
     76 
    7777        if (_combine_RGB!=DOT3_RGBA) 
    7878            glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, _combine_Alpha); 
     
    142142} 
    143143void TexEnvCombine::setOperand2_Alpha(GLint op) 
    144 {  
     144{ 
    145145    _operand2_Alpha = Valid_Operand_Alpha(op,"setOperand2_Alpha"); 
    146146}