Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-12-27 21:58:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle some malformed mpd files. Fixes #533.

Browse source 
- Skip duplicate submodels
- Skip recursive includes
This commit is contained in:
Leonardo Zide 2020-11-25 19:54:32 -08:00
parent f386de205d
commit 462897caf7
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/lc_model.cpp
View file

@ -734,6 +734,14 @@ void lcModel::LoadLDraw(QIODevice& Device, Project* Project)
Piece->SetColorCode(ColorCode);
Piece->VerifyControlPoints(ControlPoints);
Piece->SetControlPoints(ControlPoints);
if (Piece->mPieceInfo->IsModel() && Piece->mPieceInfo->GetModel()->IncludesModel(this))
{
delete Piece;
Piece = nullptr;
continue;
}
AddPiece(Piece);
Piece = nullptr;
}

10
common/project.cpp
View file

@ -400,6 +400,13 @@ bool Project::Load(const QString& FileName)
int Pos = Model->SplitMPD(Buffer);
if (Models.empty() || !Model->GetFileName().isEmpty())
{
auto ModelCompare = [Model](const std::pair<int, lcModel*>& ModelIt)
{
return ModelIt.second->GetFileName() == Model->GetFileName();
};
if (std::find_if(Models.begin(), Models.end(), ModelCompare) == Models.end())
{
mModels.Add(Model);
Models.emplace_back(std::make_pair(Pos, Model));
@ -408,6 +415,9 @@ bool Project::Load(const QString& FileName)
else
delete Model;
}
else
delete Model;
}
for (size_t ModelIdx = 0; ModelIdx < Models.size(); ModelIdx++)
{