This commit is contained in:
Leonardo Zide 2020-12-19 16:13:25 -08:00
parent b77210db22
commit 546ab19785
2 changed files with 6 additions and 11 deletions

View file

@ -1,16 +1,10 @@
#include "lc_global.h" #include "lc_global.h"
#include "minifig.h" #include "minifig.h"
#include "lc_colors.h" #include "lc_colors.h"
#include <string.h>
#include <stdio.h>
#include "camera.h"
#include "pieceinf.h" #include "pieceinf.h"
#include "project.h"
#include "lc_model.h" #include "lc_model.h"
#include "lc_library.h" #include "lc_library.h"
#include "lc_application.h" #include "lc_application.h"
#include "lc_context.h"
#include "lc_scene.h"
#include "lc_file.h" #include "lc_file.h"
#include "lc_profile.h" #include "lc_profile.h"

View file

@ -58,7 +58,7 @@ lcQMinifigDialog::lcQMinifigDialog(QWidget* Parent)
for (int ItemIndex = 0; ItemIndex < LC_MFW_NUMITEMS; ItemIndex++) for (int ItemIndex = 0; ItemIndex < LC_MFW_NUMITEMS; ItemIndex++)
{ {
std::vector<lcMinifigPieceInfo>& PartList = mMinifigWizard->mSettings[ItemIndex]; const std::vector<lcMinifigPieceInfo>& PartList = mMinifigWizard->mSettings[ItemIndex];
QStringList ItemStrings; QStringList ItemStrings;
QVector<int> Separators; QVector<int> Separators;
@ -81,10 +81,11 @@ lcQMinifigDialog::lcQMinifigDialog(QWidget* Parent)
ItemCombo->setCurrentIndex(mMinifigWizard->GetSelectionIndex(ItemIndex)); ItemCombo->setCurrentIndex(mMinifigWizard->GetSelectionIndex(ItemIndex));
ItemCombo->blockSignals(false); ItemCombo->blockSignals(false);
lcQColorPicker *colorPicker = mColorPickers[ItemIndex]; lcQColorPicker* ColorPicker = mColorPickers[ItemIndex];
colorPicker->blockSignals(true);
colorPicker->setCurrentColor(mMinifigWizard->mMinifig.Colors[ItemIndex]); ColorPicker->blockSignals(true);
colorPicker->blockSignals(false); ColorPicker->setCurrentColor(mMinifigWizard->mMinifig.Colors[ItemIndex]);
ColorPicker->blockSignals(false);
} }
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))