From d0ec7cad96eed8792ed8fc8587039338e1c03c71 Mon Sep 17 00:00:00 2001 From: granzuglia Date: Tue, 12 May 2009 14:03:48 +0000 Subject: [PATCH] removed previous patch --- wrap/io_trimesh/import_dae.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/wrap/io_trimesh/import_dae.h b/wrap/io_trimesh/import_dae.h index b060e235..3dd74c47 100644 --- a/wrap/io_trimesh/import_dae.h +++ b/wrap/io_trimesh/import_dae.h @@ -538,7 +538,7 @@ class ColladaMesh : public vcg::tri::TriMesh< std::vector, std err = LoadTriangularMesh(tripatch,m,offset,info,materialBinding); //err = LoadPolygonalMesh(polypatch,m,offset,info); // err = OldLoadPolygonalListMesh(polylist,m,offset,info); - err = LoadPolygonalListMesh(polylist,m,offset,info,materialBinding); + err = LoadPolygonalListMesh(polylist,m,offset,info,materialBinding); if (err != E_NOERROR) return err; } @@ -554,12 +554,7 @@ class ColladaMesh : public vcg::tri::TriMesh< std::vector, std QDomNodeList nlst = txlst.at(0).childNodes().at(img).toElement().elementsByTagName("init_from"); if (nlst.size() > 0) { - QString texname = nlst.at(0).firstChild().nodeValue(); - - if (!texname.isNull() && texname.at(0) != '/') - texname.insert(0,"./"); - - texturefile.push_back(texname); + texturefile.push_back( nlst.at(0).firstChild().nodeValue()); } } }