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

small fix texture defrag

Browse Source
This commit is contained in:
alemuntoni 2021-05-23 18:36:46 +02:00
parent 26da4e6495
commit 89ba5966e8
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/ml_document/mesh_model.cpp
View File

@ -168,7 +168,7 @@ void MeshModel::updateDataMask()
currentDataMask |= MM_WEDGTEXCOORD;
}
void MeshModel::updateDataMask(MeshModel *m)
void MeshModel::updateDataMask(const MeshModel *m)
{
updateDataMask(m->currentDataMask);
}

2
src/common/ml_document/mesh_model.h
View File

@ -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;

7
src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.cpp
View File

@ -197,15 +197,12 @@ std::map<std::string, QVariant> FilterTextureDefragPlugin::applyFilter(
unsigned int& /*postConditionMask*/,
CallBackPos *cb)
{
MeshModel &currentModel = *(md.mm());
const MeshModel &currentModel = *(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(&currentModel);
tri::Append<CMeshO, CMeshO>::Mesh(mm.cm, currentModel.cm);
mm.UpdateBoxAndNormals();
mm.cm.Tr = currentModel.cm.Tr;
GLExtensionsManager::initializeGLextensions();