manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed previous patch

This commit is contained in:
granzuglia 2009-05-12 14:03:48 +00:00
parent 7bfa17ffa6
commit d0ec7cad96
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wrap/io_trimesh/import_dae.h
View File

@ -538,7 +538,7 @@ class ColladaMesh : public vcg::tri::TriMesh< std::vector<ColladaVertex>, std
err = LoadTriangularMesh(tripatch,m,offset,info,materialBinding); err = LoadTriangularMesh(tripatch,m,offset,info,materialBinding);
//err = LoadPolygonalMesh(polypatch,m,offset,info); //err = LoadPolygonalMesh(polypatch,m,offset,info);
// err = OldLoadPolygonalListMesh(polylist,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) if (err != E_NOERROR)
return err; return err;
} }
@ -554,12 +554,7 @@ class ColladaMesh : public vcg::tri::TriMesh< std::vector<ColladaVertex>, std
QDomNodeList nlst = txlst.at(0).childNodes().at(img).toElement().elementsByTagName("init_from"); QDomNodeList nlst = txlst.at(0).childNodes().at(img).toElement().elementsByTagName("init_from");
if (nlst.size() > 0) if (nlst.size() > 0)
{ {
QString texname = nlst.at(0).firstChild().nodeValue(); texturefile.push_back( nlst.at(0).firstChild().nodeValue());
if (!texname.isNull() && texname.at(0) != '/')
texname.insert(0,"./");
texturefile.push_back(texname);
} }
} }
} }