mirror of
https://github.com/leozide/leocad
synced 2024-11-17 07:47:55 +01:00
Fixed submodels not being added to instructions.
This commit is contained in:
parent
0a75fd3755
commit
d4a081d4b8
1 changed files with 2 additions and 2 deletions
|
@ -83,7 +83,7 @@ bool lcInstructions::GetBoolProperty(lcInstructionsPropertyType Type, lcModel* M
|
|||
QColor lcInstructions::GetColorProperty(lcInstructionsPropertyType Type, lcModel* Model, lcStep Step) const
|
||||
{
|
||||
QVariant Value = GetProperty(Type, Model, Step);
|
||||
return lcRGBAFromQColor(Value.toUInt());
|
||||
return lcQColorFromRGBA(Value.toUInt());
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
if (std::find(AddedModels.begin(), AddedModels.end(), SubModel) != AddedModels.end())
|
||||
if (std::find(AddedModels.begin(), AddedModels.end(), SubModel) == AddedModels.end())
|
||||
StepSubModels.insert(SubModel);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue