From d8d47199f2e4b4163a808996b09b0b86f447fc6a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 26 Nov 2010 17:37:42 +0000 Subject: [PATCH] From Katharina Plugge, fix for regression in handling of multitexturing. --- src/osgPlugins/OpenFlight/FltExportVisitor.h | 2 +- src/osgPlugins/OpenFlight/expGeometryRecords.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/OpenFlight/FltExportVisitor.h b/src/osgPlugins/OpenFlight/FltExportVisitor.h index e125d8166..0a89aa978 100644 --- a/src/osgPlugins/OpenFlight/FltExportVisitor.h +++ b/src/osgPlugins/OpenFlight/FltExportVisitor.h @@ -137,7 +137,7 @@ public: void writeLocalVertexPool( const osg::Geometry& geom ); void writeMultitexture( const osg::Geometry& geom ); void writeUVList( int numVerts, const osg::Geometry& geom, const std::vector& indices ); - void writeUVList( int numVerts, const osg::Geometry& geom, unsigned int first); + void writeUVList( int numVerts, const osg::Geometry& geom, unsigned int first=0); // Light Point records void writeLightPoint(); diff --git a/src/osgPlugins/OpenFlight/expGeometryRecords.cpp b/src/osgPlugins/OpenFlight/expGeometryRecords.cpp index a712efb66..de61c193c 100644 --- a/src/osgPlugins/OpenFlight/expGeometryRecords.cpp +++ b/src/osgPlugins/OpenFlight/expGeometryRecords.cpp @@ -947,7 +947,7 @@ FltExportVisitor::handleDrawArrays( const osg::DrawArrays* da, const osg::Geomet int numVerts = writeVertexList( first, n ); first += n; - writeUVList( numVerts, geom, first ); + writeUVList( numVerts, geom ); writePop(); } @@ -1032,7 +1032,7 @@ FltExportVisitor::handleDrawArrayLengths( const osg::DrawArrayLengths* dal, cons first += n; } - writeUVList( numVerts, geom, first ); + writeUVList( numVerts, geom ); writePop(); }