Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-11-17 07:47:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed submodels not being added to instructions.

Browse source
This commit is contained in:
Leonardo Zide 2022-03-13 16:46:14 -07:00
parent 0a75fd3755
commit d4a081d4b8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/lc_instructions.cpp
View file

@ -83,7 +83,7 @@ bool lcInstructions::GetBoolProperty(lcInstructionsPropertyType Type, lcModel* M
QColor lcInstructions::GetColorProperty(lcInstructionsPropertyType Type, lcModel* Model, lcStep Step) const QColor lcInstructions::GetColorProperty(lcInstructionsPropertyType Type, lcModel* Model, lcStep Step) const
{ {
QVariant Value = GetProperty(Type, Model, Step); QVariant Value = GetProperty(Type, Model, Step);
return lcRGBAFromQColor(Value.toUInt()); return lcQColorFromRGBA(Value.toUInt());
} }
QFont lcInstructions::GetFontProperty(lcInstructionsPropertyType Type, lcModel* Model, lcStep Step) const QFont lcInstructions::GetFontProperty(lcInstructionsPropertyType Type, lcModel* Model, lcStep Step) const
@ -186,7 +186,7 @@ void lcInstructions::AddDefaultPages(lcModel* Model, std::vector<const lcModel*>
{ {
lcModel* SubModel = Piece->mPieceInfo->GetModel(); lcModel* SubModel = Piece->mPieceInfo->GetModel();
if (std::find(AddedModels.begin(), AddedModels.end(), SubModel) != AddedModels.end()) if (std::find(AddedModels.begin(), AddedModels.end(), SubModel) == AddedModels.end())
StepSubModels.insert(SubModel); StepSubModels.insert(SubModel);
} }
} }