diff --git a/examples/osgvirtualprogram/CreateAdvancedHierachy.cpp b/examples/osgvirtualprogram/CreateAdvancedHierachy.cpp index 378874010..ee847ba34 100644 --- a/examples/osgvirtualprogram/CreateAdvancedHierachy.cpp +++ b/examples/osgvirtualprogram/CreateAdvancedHierachy.cpp @@ -577,4 +577,3 @@ char DirectionalLightShaderSource[] = " diffuse += gl_LightSource[i].diffuse * nDotVP; \n" //22 " specular += gl_LightSource[i].specular * pf; \n" //23 "} \n";//24 - diff --git a/examples/osgvirtualprogram/VirtualProgram.cpp b/examples/osgvirtualprogram/VirtualProgram.cpp index 8fa06dc2d..b11d0f93e 100644 --- a/examples/osgvirtualprogram/VirtualProgram.cpp +++ b/examples/osgvirtualprogram/VirtualProgram.cpp @@ -24,8 +24,8 @@ VirtualProgram::VirtualProgram( unsigned int mask ) : _mask( mask ) VirtualProgram::VirtualProgram ( const VirtualProgram& VirtualProgram, const osg::CopyOp& copyop ): osg::Program( VirtualProgram, copyop ), - _mask( VirtualProgram._mask ), - _shaderMap( VirtualProgram._shaderMap ) + _shaderMap( VirtualProgram._shaderMap ), + _mask( VirtualProgram._mask ) { } //////////////////////////////////////////////////////////////////////////////// @@ -181,4 +181,4 @@ void VirtualProgram::apply( osg::State & state ) const } //////////////////////////////////////////////////////////////////////////////// -}; // namespace osgExt +} // namespace osgExt diff --git a/examples/osgvirtualprogram/VirtualProgram.h b/examples/osgvirtualprogram/VirtualProgram.h index 533def0b5..d9c621ea6 100644 --- a/examples/osgvirtualprogram/VirtualProgram.h +++ b/examples/osgvirtualprogram/VirtualProgram.h @@ -59,3 +59,4 @@ protected: } // namespace osgCandidate //////////////////////////////////////////////////////////////////////////////// #endif +