From 89ba5966e8ec93c2e906a42d92ff2ef4dd6717f2 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Sun, 23 May 2021 18:36:46 +0200 Subject: [PATCH] small fix texture defrag --- src/common/ml_document/mesh_model.cpp | 2 +- src/common/ml_document/mesh_model.h | 2 +- .../filter_texture_defragmentation.cpp | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/common/ml_document/mesh_model.cpp b/src/common/ml_document/mesh_model.cpp index 3f8a76c5c..8e6778e9d 100644 --- a/src/common/ml_document/mesh_model.cpp +++ b/src/common/ml_document/mesh_model.cpp @@ -168,7 +168,7 @@ void MeshModel::updateDataMask() currentDataMask |= MM_WEDGTEXCOORD; } -void MeshModel::updateDataMask(MeshModel *m) +void MeshModel::updateDataMask(const MeshModel *m) { updateDataMask(m->currentDataMask); } diff --git a/src/common/ml_document/mesh_model.h b/src/common/ml_document/mesh_model.h index 7f1c074b9..6a82d2d45 100644 --- a/src/common/ml_document/mesh_model.h +++ b/src/common/ml_document/mesh_model.h @@ -222,7 +222,7 @@ public: bool hasDataMask(const int maskToBeTested) const; void updateDataMask(); - void updateDataMask(MeshModel *m); + void updateDataMask(const MeshModel* m); void updateDataMask(int neededDataMask); void clearDataMask(int unneededDataMask); int dataMask() const; diff --git a/src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.cpp b/src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.cpp index 9f540b28a..5980b2118 100644 --- a/src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.cpp +++ b/src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.cpp @@ -197,15 +197,12 @@ std::map FilterTextureDefragPlugin::applyFilter( unsigned int& /*postConditionMask*/, CallBackPos *cb) { - MeshModel ¤tModel = *(md.mm()); + const MeshModel ¤tModel = *(md.mm()); switch(ID(filter)) { case FP_TEXTURE_DEFRAG: { - MeshModel& mm = *(md.addNewMesh("", "texdefrag_" + currentModel.label(), false)); + MeshModel& mm = *(md.addNewMesh(md.mm()->cm, "texdefrag_" + currentModel.label())); mm.updateDataMask(¤tModel); - tri::Append::Mesh(mm.cm, currentModel.cm); - mm.UpdateBoxAndNormals(); - mm.cm.Tr = currentModel.cm.Tr; GLExtensionsManager::initializeGLextensions();