AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-15 12:05:52 +00:00
Code Issues Projects Releases Wiki Activity

Require Blender 2.83

Browse Source
This commit is contained in:
Luke Street 2020-06-13 20:09:17 -04:00
parent 45fe93ee94
commit 0dd67e0662
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hecl-gui/CMakeLists.txt
View File

@ -79,7 +79,6 @@ target_link_libraries(hecl-gui PRIVATE
hecl-light hecl-light
zeus zeus
${ZLIB_LIBRARIES}
) )
target_include_directories(hecl-gui PRIVATE quazip/quazip) target_include_directories(hecl-gui PRIVATE quazip/quazip)

2
hecl-gui/FindBlender.cpp
View File

@ -51,7 +51,7 @@ hecl::SystemString FindBlender(int& major, int& minor) {
/* No steam; try default */ /* No steam; try default */
wchar_t progFiles[256]; wchar_t progFiles[256];
if (GetEnvironmentVariableW(L"ProgramFiles", 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; blenderBin = BLENDER_BIN_BUF;
if (!RegFileExists(blenderBin)) if (!RegFileExists(blenderBin))
blenderBin = nullptr; blenderBin = nullptr;

4
hecl-gui/MainWindow.cpp
View File

@ -301,7 +301,7 @@ void MainWindow::onBinaryDownloaded(QuaZip& file) {
m_ui->downloadErrorLabel->setText(tr("Download successful - Press 'Extract' to continue."), true); m_ui->downloadErrorLabel->setText(tr("Download successful - Press 'Extract' to continue."), true);
} }
if (!err && !m_ui->sysReqTable->isBlenderVersionOk()) { 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()) { 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()) { } else if (m_ui->launchBtn->isEnabled()) {
insertContinueNote(tr("Package complete - Press 'Launch' to start URDE.")); insertContinueNote(tr("Package complete - Press 'Launch' to start URDE."));
} else if (m_ui->packageBtn->isEnabled()) { } else if (m_ui->packageBtn->isEnabled()) {

2
hecl-gui/SysReqTableView.cpp
View File

@ -200,7 +200,7 @@ QVariant SysReqTableModel::data(const QModelIndex& index, int role) const {
return {}; return {};
#endif #endif
case 5: case 5:
return tr("Blender 2.82"); return tr("Blender 2.83");
} }
} else if (index.column() == 1) { } else if (index.column() == 1) {
/* Your System */ /* Your System */

2
hecl-gui/SysReqTableView.hpp
View File

@ -31,7 +31,7 @@ public:
int columnCount(const QModelIndex& parent = QModelIndex()) const override; int columnCount(const QModelIndex& parent = QModelIndex()) const override;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) 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; 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); void updateFreeDiskSpace(const QString& path);
}; };