diff --git a/wrap/gl/pick.h b/wrap/gl/pick.h index 4c4d0b63..fdc75c8d 100644 --- a/wrap/gl/pick.h +++ b/wrap/gl/pick.h @@ -165,6 +165,7 @@ public: } delete [] buffer; + return result.size(); } }; diff --git a/wrap/gl/picking.h b/wrap/gl/picking.h index f91556a2..77007497 100644 --- a/wrap/gl/picking.h +++ b/wrap/gl/picking.h @@ -75,6 +75,7 @@ int Pick( const int & x, const int &y, GLint viewport[4]; glGetIntegerv(GL_VIEWPORT,viewport); + glPushAttrib(GL_TRANSFORM_BIT); glMatrixMode(GL_PROJECTION); glGetDoublev(GL_PROJECTION_MATRIX ,mp); glPushMatrix(); @@ -114,7 +115,7 @@ int Pick( const int & x, const int &y, std::advance(ei ,H[ii].second); result[ii]=&*ei; } - + glPopAttrib(); delete [] selectBuf; return int(result.size()); } diff --git a/wrap/io_trimesh/import_dae.h b/wrap/io_trimesh/import_dae.h index b943f3c4..2fa84365 100644 --- a/wrap/io_trimesh/import_dae.h +++ b/wrap/io_trimesh/import_dae.h @@ -271,6 +271,7 @@ class ColladaMesh : public vcg::tri::TriMesh< std::vector, std ++fp; } assert(fp==m.face.end()); + return E_NOERROR; } static DAEError OldLoadPolygonalListMesh(QDomNodeList& polylist,ColladaMesh& m,const size_t offset,InfoDAE* info) diff --git a/wrap/io_trimesh/import_obj.h b/wrap/io_trimesh/import_obj.h index f3304730..83cbd5b3 100644 --- a/wrap/io_trimesh/import_obj.h +++ b/wrap/io_trimesh/import_obj.h @@ -92,6 +92,7 @@ Initial Working version coded by Buzzelli. #include #include #include +#include #include #include