From 3d14df75e4c1d26fd0d4d09487b6773c009ac6e9 Mon Sep 17 00:00:00 2001 From: cignoni Date: Wed, 7 Jan 2009 14:54:22 +0000 Subject: [PATCH] corrected small bug that prevented the loading of tristripped ply files --- wrap/io_trimesh/import_ply.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrap/io_trimesh/import_ply.h b/wrap/io_trimesh/import_ply.h index 5d3a7a4a..36abda50 100644 --- a/wrap/io_trimesh/import_ply.h +++ b/wrap/io_trimesh/import_ply.h @@ -312,7 +312,7 @@ static const PropDescriptor &FaceDesc(int i) /* 16 */ {"face", "vertex_indices", ply::T_UINT, ply::T_INT, offsetof(LoadPly_FaceAux,v), 1,0,ply::T_INT, ply::T_CHAR,offsetof(LoadPly_FaceAux,size) ,0}, /* 17 */ {"face", "vertex_indices", ply::T_SHORT, ply::T_INT, offsetof(LoadPly_FaceAux,v), 1,0,ply::T_CHAR, ply::T_CHAR,offsetof(LoadPly_FaceAux,size) ,0}, /* 18 */ {"face", "vertex_indices", ply::T_SHORT, ply::T_INT, offsetof(LoadPly_FaceAux,v), 1,0,ply::T_UCHAR,ply::T_CHAR,offsetof(LoadPly_FaceAux,size) ,0}, -/* 18 */ {"face", "vertex_indices", ply::T_SHORT, ply::T_INT, offsetof(LoadPly_FaceAux,v), 1,0,ply::T_INT, ply::T_CHAR,offsetof(LoadPly_FaceAux,size) ,0}, +/* 19 */ {"face", "vertex_indices", ply::T_SHORT, ply::T_INT, offsetof(LoadPly_FaceAux,v), 1,0,ply::T_INT, ply::T_CHAR,offsetof(LoadPly_FaceAux,size) ,0} }; return qf[i]; } @@ -478,7 +478,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) if( pf.AddToRead(FaceDesc(0))==-1 ) // Se fallisce si prova anche la sintassi di rapidform con index al posto di indices { int ii; - for(int ii=_FACEDESC_FIRST_;ii< _FACEDESC_LAST_;++ii) + for(ii=_FACEDESC_FIRST_;ii< _FACEDESC_LAST_;++ii) if( pf.AddToRead(FaceDesc(ii))!=-1 ) break; if(ii==_FACEDESC_LAST_) if(pf.AddToRead(TristripDesc(0))==-1) // Se fallisce tutto si prova a vedere se ci sono tristrip alla levoy.