From 212c15b77b4379c51ab9ed34d7131a4680185b12 Mon Sep 17 00:00:00 2001 From: ganovelli Date: Fri, 18 Jun 2010 08:35:36 +0000 Subject: [PATCH] update calls to Append<..>::Mesh(..) --- wrap/io_trimesh/import_dae.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/wrap/io_trimesh/import_dae.h b/wrap/io_trimesh/import_dae.h index aea1403d..5d150849 100644 --- a/wrap/io_trimesh/import_dae.h +++ b/wrap/io_trimesh/import_dae.h @@ -39,13 +39,11 @@ namespace io { class ImporterDAE : public UtilDAE { public: - class ColladaEdge; class ColladaFace; class ColladaVertex; class ColladaTypes: public vcg::UsedTypes < vcg::Use::template AsVertexType, - vcg::Use::template AsEdgeType, - vcg::Use::template AsFaceType >{}; + vcg::Use::template AsFaceType >{}; class ColladaVertex : public vcg::Vertex< ColladaTypes, vcg::vertex::Coord3f, /* 12b */ @@ -606,7 +604,7 @@ namespace io { // newMesh.face.EnableWedgeTex(); LoadGeometry(newMesh, info, refNode.toElement(),materialBindingMap); tri::UpdatePosition::Matrix(newMesh,curTr); - tri::Append::Mesh(m,newMesh,false,true); + tri::Append::Mesh(m,newMesh); QDEBUG("** instance_geometry with url %s (final mesh size %i %i - %i %i)",qPrintable(instGeomNode.attribute("url")),m.vn,m.vert.size(),m.fn,m.face.size()); } } @@ -796,7 +794,7 @@ static Matrix44f getTransfMatrixFromNode(const QDomElement parentNode) { ColladaMesh newMesh; AddNodeToMesh(node.toElement(), newMesh, baseTr,info); - tri::Append::Mesh(m,newMesh,false,true); + tri::Append::Mesh(m,newMesh); } } // end for each node of a given scene } // end for each visual scene instance