diff --git a/src/osgPlugins/ac/Geode.cpp b/src/osgPlugins/ac/Geode.cpp index 7421d32ea..e656ae94e 100644 --- a/src/osgPlugins/ac/Geode.cpp +++ b/src/osgPlugins/ac/Geode.cpp @@ -659,7 +659,7 @@ void Geode::OutputPolygonDelsUInt(const int iCurrentMaterial, const unsigned int } -const int Geode::ProcessMaterial(ostream& fout, const unsigned int igeode) +int Geode::ProcessMaterial(ostream& fout, const unsigned int igeode) { // outputs materials from one geode // extended for multiple geode models, GWM 2003. diff --git a/src/osgPlugins/ac/Geode.h b/src/osgPlugins/ac/Geode.h index acf86744a..65b88c971 100644 --- a/src/osgPlugins/ac/Geode.h +++ b/src/osgPlugins/ac/Geode.h @@ -9,7 +9,7 @@ namespace ac3d class Geode : public osg::Geode { public: - const int ProcessMaterial(std::ostream& fout, const unsigned int igeode); + int ProcessMaterial(std::ostream& fout, const unsigned int igeode); void ProcessGeometry(std::ostream& fout, const unsigned int igeode); private: void OutputTriangle(const int iCurrentMaterial,const unsigned int surfaceFlags, diff --git a/src/osgPlugins/ac/ac3d.cpp b/src/osgPlugins/ac/ac3d.cpp index 7c315a4a9..acca77b46 100644 --- a/src/osgPlugins/ac/ac3d.cpp +++ b/src/osgPlugins/ac/ac3d.cpp @@ -768,7 +768,7 @@ class LineBin : public PrimitiveBin return true; } - virtual osg::Geode* finalize(const MaterialData& material, const TextureData& textureData) + virtual osg::Geode* finalize(const MaterialData& material, const TextureData& /*textureData*/) { _geode->addDrawable(_geometry.get()); material.toStateSet(_geode->getOrCreateStateSet());