FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed shadows warnings

Browse Source
This commit is contained in:
Robert Osfield
2016-05-26 09:48:16 +01:00
parent bdad1f60c9
commit bf8e22ae63
8 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgPlugins/dae/daeWriter.cpp
View File

@@ -24,11 +24,11 @@
namespace osgDAE {
daeWriter::ArrayNIndices::ArrayNIndices( osg::Array* valArray, osg::IndexArray* ind ) :
daeWriter::ArrayNIndices::ArrayNIndices( osg::Array* vArray, osg::IndexArray* ind ) :
vec2(0), vec3(0), vec4(0),
vec2d(0), vec3d(0), vec4d(0),
vec4ub(0),
valArray(valArray),
valArray(vArray),
inds( ind ), mode(NONE)
{
if ( valArray != NULL )
@@ -248,9 +248,9 @@ void daeWriter::updateCurrentDaeNode()
}
}
std::string daeWriter::uniquify( const std::string &_name )
std::string daeWriter::uniquify( const std::string & uname )
{
const std::string baseName( _pluginOptions.namesUseCodepage ? osgDB::convertStringFromCurrentCodePageToUTF8(_name) : _name );
const std::string baseName( _pluginOptions.namesUseCodepage ? osgDB::convertStringFromCurrentCodePageToUTF8(uname) : uname );
std::string newName( baseName );
if (_pluginOptions.renameIds)
{