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

erased wrong assert

This commit is contained in:
granzuglia 2008-02-04 22:29:02 +00:00
parent a39a42d2ca
commit b0346b1ab9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wrap/io_trimesh/import_dae.h
View File

@ -3,7 +3,7 @@
//importer for collada's files //importer for collada's files
#include<wrap/io_trimesh/util_dae.h> #include<wrap/dae/util_dae.h>
namespace vcg { namespace vcg {
namespace tri { namespace tri {
@ -296,11 +296,14 @@ namespace io {
return E_NOPOLYGONALMESH; return E_NOPOLYGONALMESH;
DAEError err = E_NOERROR; DAEError err = E_NOERROR;
if (tripatch_size != 0) err = LoadTriangularMesh(tripatch,m,offset,info); if (tripatch_size != 0)
err = LoadTriangularMesh(tripatch,m,offset,info);
else else
if (polypatch_size != 0) err = LoadPolygonalMesh(polypatch,m,offset,info); if (polypatch_size != 0)
err = LoadPolygonalMesh(polypatch,m,offset,info);
else else
if (polylist_size != 0) err = LoadPolygonalListMesh(polylist,m,offset,info); if (polylist_size != 0)
err = LoadPolygonalListMesh(polylist,m,offset,info);
if (err != E_NOERROR) return err; if (err != E_NOERROR) return err;
} }
return E_NOERROR; return E_NOERROR;