lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-20 03:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cnr-isti-vclab/meshlab

Browse Source
This commit is contained in:
Paolo Cignoni 2018-02-21 16:06:08 +01:00
commit 3b4d7aceab
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/meshlabplugins/filter_sampling/filter_sampling.cpp
View File

@ -776,6 +776,8 @@ switch(ID(action))
mm->updateDataMask(curMM);
BaseSampler mps(&(mm->cm));
mps.perFaceNormal = par.getBool("PerFaceNormal");
if(par.getBool("EdgeSampling"))
{
tri::SurfaceSampling<CMeshO,BaseSampler>::EdgeMontecarlo(curMM->cm,mps,par.getInt("SampleNum"),false);
@ -1237,7 +1239,7 @@ switch(ID(action))
Point3i volumeDim;
Box3m volumeBox = baseMesh->cm.bbox;
volumeBox.Offset(volumeBox.Diag()/10.0f+offsetThr);
volumeBox.Offset(volumeBox.Diag()/10.0f+abs(offsetThr));
BestDim(volumeBox , voxelSize, volumeDim );
Log("Resampling mesh using a volume of %i x %i x %i",volumeDim[0],volumeDim[1],volumeDim[2]);

2
src/meshlabplugins/filter_texture/filter_texture.cpp
View File

@ -1045,7 +1045,7 @@ bool FilterTexturePlugin::applyFilter(QAction *filter, MeshDocument &md, RichPar
assert(srcMesh!=NULL);
assert(trgMesh!=NULL);
CheckError(trgMesh->cm.fn == 0, "Source mesh requires to have faces");
CheckError(srcMesh->cm.fn == 0, "Source mesh requires to have faces");
// Check whether is possible to access source mesh texture
CheckError(!srcMesh->hasDataMask(MeshModel::MM_WEDGTEXCOORD), "Source mesh doesn't have Per Wedge Texture Coordinates");