From 0fc8a49a5151f7b5b9fdd19926addd3e64de3679 Mon Sep 17 00:00:00 2001 From: dibenedetto Date: Sat, 22 May 2010 19:47:43 +0000 Subject: [PATCH] --- vcg/complex/trimesh/base.h | 3 +++ wrap/io_trimesh/import_dae.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/vcg/complex/trimesh/base.h b/vcg/complex/trimesh/base.h index 4c0a3a50..ebe286f0 100644 --- a/vcg/complex/trimesh/base.h +++ b/vcg/complex/trimesh/base.h @@ -589,6 +589,9 @@ bool HasVFAdjacency (const TriMesh < ContainerType0 , ContainerType1, Containe // for the macro assert bool a1 = TriMesh < ContainerType0 , ContainerType1, ContainerType2, ContainerType3>::FaceContainer::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); return TriMesh < ContainerType0 , ContainerType1, ContainerType2, ContainerType3>::FaceContainer::value_type::HasVFAdjacency(); } diff --git a/wrap/io_trimesh/import_dae.h b/wrap/io_trimesh/import_dae.h index c25b3a1e..aea1403d 100644 --- a/wrap/io_trimesh/import_dae.h +++ b/wrap/io_trimesh/import_dae.h @@ -422,6 +422,8 @@ namespace io { static int LoadControllerMesh(ColladaMesh& m, InfoDAE& info, const QDomElement& geo,QMap materialBindingMap, CallBackPos *cb=0) { + (void)cb; + assert(geo.tagName() == "controller"); QDomNodeList skinList = geo.toElement().elementsByTagName("skin"); if(skinList.size()!=1) return E_CANTOPEN;