electron-rare/leocad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blender addon - update progress to detect Blender version 3 or greater

Browse Source
This commit is contained in:
Trevor SANDY
2025-01-02 09:32:02 +01:00
parent 3e60ee3707
commit 1775dc6bdf
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qt/lc_renderdialog.cpp
+6 -3
View File
@@ -425,7 +425,7 @@ void lcRenderDialog::on_RenderButton_clicked()
QApplication::processEvents();
mBlendProgValue = 0;
mBlendProgMax = 0;
mBlendProgMax = 0;
const QStringList DataPathList = QStandardPaths::standardLocations(QStandardPaths::AppLocalDataLocation);
mDataPath = DataPathList.first();
@@ -582,6 +582,8 @@ void lcRenderDialog::on_RenderButton_clicked()
}
else
{
ui->RenderProgress->setRange(mBlendProgValue, mBlendProgMax);
ui->RenderProgress->setValue(1);
#ifdef Q_OS_WIN
mProcess->start(ShellProgram, QStringList() << "/C" << Script.fileName());
#else
@@ -622,9 +624,10 @@ void lcRenderDialog::ReadStdOut()
QRegExp RxRenderProgress;
RxRenderProgress.setCaseSensitivity(Qt::CaseInsensitive);
#endif
bool BlenderVersion3 = lcGetProfileString(LC_PROFILE_BLENDER_VERSION).startsWith("v3");
int BlenderVersionNum = QString(lcGetProfileString(LC_PROFILE_BLENDER_VERSION).at(1)).toInt();
bool BlenderVersion3OrGreater = BlenderVersionNum > 2;
if (BlenderVersion3)
if (BlenderVersion3OrGreater)
RxRenderProgress.setPattern("Sample (\\d+)\\/(\\d+)");
else
RxRenderProgress.setPattern("(\\d+)\\/(\\d+) Tiles");