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/osgAnimation/UpdateMaterial.cpp

    r12292 r13041  
    1 /*  -*-c++-*-  
     1/*  -*-c++-*- 
    22 *  Copyright (C) 2009 Cedric Pinson <cedric.pinson@plopbyte.net> 
    33 * 
    4  * This library is open source and may be redistributed and/or modified under   
    5  * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or  
     4 * This library is open source and may be redistributed and/or modified under 
     5 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
    66 * (at your option) any later version.  The full license is in LICENSE file 
    77 * included with this distribution, and on the openscenegraph.org website. 
    8  *  
     8 * 
    99 * This library is distributed in the hope that it will be useful, 
    1010 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
     11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1212 * OpenSceneGraph Public License for more details. 
    1313 */ 
     
    1818using namespace osgAnimation; 
    1919 
    20 UpdateMaterial::UpdateMaterial(const UpdateMaterial& apc,const osg::CopyOp& copyop)  
     20UpdateMaterial::UpdateMaterial(const UpdateMaterial& apc,const osg::CopyOp& copyop) 
    2121    : osg::Object(apc, copyop), 
    2222      AnimationUpdateCallback<osg::StateAttributeCallback>(apc, copyop) 
     
    4444 
    4545osgAnimation::Vec4Target* UpdateMaterial::getDiffuse() { return _diffuse.get(); } 
    46 void UpdateMaterial::update(osg::Material& material)  
     46void UpdateMaterial::update(osg::Material& material) 
    4747{ 
    4848    osg::Vec4 diffuse = _diffuse->getValue(); 
     
    5656        return channel->setTarget(_diffuse.get()); 
    5757    } 
    58     else  
     58    else 
    5959    { 
    6060        OSG_WARN << "Channel " << channel->getName() << " does not contain a valid symbolic name for this class " << className() << std::endl;