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

This commit is contained in:
Marco Di Benedetto 2010-05-22 19:47:43 +00:00
parent 13f0066cfa
commit 0fc8a49a51
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vcg/complex/trimesh/base.h
View File

@ -589,6 +589,9 @@ bool HasVFAdjacency (const TriMesh < ContainerType0 , ContainerType1, Containe
// for the macro assert // for the macro assert
bool a1 = TriMesh < ContainerType0 , ContainerType1, ContainerType2, ContainerType3>::FaceContainer::value_type::HasVFAdjacency(); bool a1 = TriMesh < ContainerType0 , ContainerType1, ContainerType2, ContainerType3>::FaceContainer::value_type::HasVFAdjacency();
bool a2 = TriMesh < ContainerType0 , ContainerType1, ContainerType2, ContainerType3>::VertContainer::value_type::HasVFAdjacency(); bool a2 = TriMesh < ContainerType0 , ContainerType1, ContainerType2, ContainerType3>::VertContainer::value_type::HasVFAdjacency();
// a1 and a2 are still evaluated but not referenced, this causes a warning
(void)a1;
(void)a2;
assert(a1==a2); assert(a1==a2);
return TriMesh < ContainerType0 , ContainerType1, ContainerType2, ContainerType3>::FaceContainer::value_type::HasVFAdjacency(); return TriMesh < ContainerType0 , ContainerType1, ContainerType2, ContainerType3>::FaceContainer::value_type::HasVFAdjacency();
} }

2
wrap/io_trimesh/import_dae.h
View File

@ -422,6 +422,8 @@ namespace io {
static int LoadControllerMesh(ColladaMesh& m, InfoDAE& info, const QDomElement& geo,QMap<QString, QString> materialBindingMap, CallBackPos *cb=0) static int LoadControllerMesh(ColladaMesh& m, InfoDAE& info, const QDomElement& geo,QMap<QString, QString> materialBindingMap, CallBackPos *cb=0)
{ {
(void)cb;
assert(geo.tagName() == "controller"); assert(geo.tagName() == "controller");
QDomNodeList skinList = geo.toElement().elementsByTagName("skin"); QDomNodeList skinList = geo.toElement().elementsByTagName("skin");
if(skinList.size()!=1) return E_CANTOPEN; if(skinList.size()!=1) return E_CANTOPEN;