diff --git a/hecl-gui/CMakeLists.txt b/hecl-gui/CMakeLists.txt index 51019af67..fa2ea1786 100644 --- a/hecl-gui/CMakeLists.txt +++ b/hecl-gui/CMakeLists.txt @@ -79,7 +79,6 @@ target_link_libraries(hecl-gui PRIVATE hecl-light zeus - ${ZLIB_LIBRARIES} ) target_include_directories(hecl-gui PRIVATE quazip/quazip) diff --git a/hecl-gui/FindBlender.cpp b/hecl-gui/FindBlender.cpp index cfd563217..68bd490e8 100644 --- a/hecl-gui/FindBlender.cpp +++ b/hecl-gui/FindBlender.cpp @@ -51,7 +51,7 @@ hecl::SystemString FindBlender(int& major, int& minor) { /* No steam; try default */ wchar_t progFiles[256]; if (GetEnvironmentVariableW(L"ProgramFiles", progFiles, 256)) { - _snwprintf(BLENDER_BIN_BUF, 2048, L"%s\\Blender Foundation\\Blender 2.82\\blender.exe", progFiles); + _snwprintf(BLENDER_BIN_BUF, 2048, L"%s\\Blender Foundation\\Blender 2.83\\blender.exe", progFiles); blenderBin = BLENDER_BIN_BUF; if (!RegFileExists(blenderBin)) blenderBin = nullptr; diff --git a/hecl-gui/MainWindow.cpp b/hecl-gui/MainWindow.cpp index 9f9ae6152..50cfa55f3 100644 --- a/hecl-gui/MainWindow.cpp +++ b/hecl-gui/MainWindow.cpp @@ -301,7 +301,7 @@ void MainWindow::onBinaryDownloaded(QuaZip& file) { m_ui->downloadErrorLabel->setText(tr("Download successful - Press 'Extract' to continue."), true); } if (!err && !m_ui->sysReqTable->isBlenderVersionOk()) { - m_ui->downloadErrorLabel->setText(tr("Blender 2.82 must be installed. Please download via Steam or blender.org.")); + m_ui->downloadErrorLabel->setText(tr("Blender 2.83 must be installed. Please download via Steam or blender.org.")); } } @@ -355,7 +355,7 @@ void MainWindow::enableOperations() { } if (!m_ui->sysReqTable->isBlenderVersionOk()) { - insertContinueNote(tr("Blender 2.82 must be installed. Please download via Steam or blender.org.")); + insertContinueNote(tr("Blender 2.83 must be installed. Please download via Steam or blender.org.")); } else if (m_ui->launchBtn->isEnabled()) { insertContinueNote(tr("Package complete - Press 'Launch' to start URDE.")); } else if (m_ui->packageBtn->isEnabled()) { diff --git a/hecl-gui/SysReqTableView.cpp b/hecl-gui/SysReqTableView.cpp index d698dbac1..508d8625f 100644 --- a/hecl-gui/SysReqTableView.cpp +++ b/hecl-gui/SysReqTableView.cpp @@ -200,7 +200,7 @@ QVariant SysReqTableModel::data(const QModelIndex& index, int role) const { return {}; #endif case 5: - return tr("Blender 2.82"); + return tr("Blender 2.83"); } } else if (index.column() == 1) { /* Your System */ diff --git a/hecl-gui/SysReqTableView.hpp b/hecl-gui/SysReqTableView.hpp index 33d1dd55c..14b980638 100644 --- a/hecl-gui/SysReqTableView.hpp +++ b/hecl-gui/SysReqTableView.hpp @@ -31,7 +31,7 @@ public: int columnCount(const QModelIndex& parent = QModelIndex()) const override; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - bool isBlenderVersionOk() const { return m_blendMajor == 2 && m_blendMinor == 82; } + bool isBlenderVersionOk() const { return m_blendMajor == 2 && m_blendMinor == 83; } void updateFreeDiskSpace(const QString& path); };