diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD index 6597b4747..8927f3258 100755 --- a/builds/linux/obs/PKGBUILD +++ b/builds/linux/obs/PKGBUILD @@ -2,7 +2,7 @@ # Last Update: July 19, 2020 # Copyright (C) 2017 - 2023 by Trevor SANDY pkgname=lpub3d -pkgver=2.4.6.3391 +pkgver=2.4.6.3392 pkgrel=1 pkgdesc="An LDraw Building Instruction Editor" url="https://github.com/trevorsandy/lpub3d.git" diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD index 51dee12c7..1f5ee8454 100644 --- a/builds/linux/obs/alldeps/PKGBUILD +++ b/builds/linux/obs/alldeps/PKGBUILD @@ -2,7 +2,7 @@ # Last Update: July 19, 2020 # Copyright (C) 2017 - 2023 by Trevor SANDY pkgname=lpub3d -pkgver=2.4.6.3391 +pkgver=2.4.6.3392 pkgrel=1 pkgdesc="An LDraw Building Instruction Editor" url="https://github.com/trevorsandy/lpub3d.git" diff --git a/builds/linux/obs/alldeps/debian/changelog b/builds/linux/obs/alldeps/debian/changelog index 2c5654fd0..11eb81d84 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3391) debian; urgency=medium +lpub3d (2.4.6.3392) debian; urgency=medium - * LPub3D version 2.4.6.280.3391_20230528 for Linux + * LPub3D version 2.4.6.281.3392_20230528 for Linux - -- Trevor SANDY Sun, 28 May 2023 18:43:12 +0200 + -- Trevor SANDY Sun, 28 May 2023 18:45:13 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index 6f31897c1..8f0002f78 100644 --- a/builds/linux/obs/alldeps/debian/lpub3d.dsc +++ b/builds/linux/obs/alldeps/debian/lpub3d.dsc @@ -2,7 +2,7 @@ Format: 1.0 Source: lpub3d Binary: lpub3d Architecture: any -Version: 2.4.6.3391 +Version: 2.4.6.3392 Maintainer: Trevor SANDY Homepage: https://trevorsandy.github.io/lpub3d/ Standards-Version: 3.9.7 diff --git a/builds/linux/obs/alldeps/lpub3d.spec b/builds/linux/obs/alldeps/lpub3d.spec index 69bbc031b..afb1e357b 100644 --- a/builds/linux/obs/alldeps/lpub3d.spec +++ b/builds/linux/obs/alldeps/lpub3d.spec @@ -120,7 +120,7 @@ BuildRequires: fdupes Summary: An LDraw Building Instruction Editor Name: lpub3d Icon: lpub3d.xpm -Version: 2.4.6.3391 +Version: 2.4.6.3392 Release: %{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -797,7 +797,7 @@ update-desktop-database || true %endif %changelog -* Sun May 28 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3391 +* Sun May 28 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3392 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670 diff --git a/builds/linux/obs/debian/changelog b/builds/linux/obs/debian/changelog index 74cd3a369..8b9f23f80 100644 --- a/builds/linux/obs/debian/changelog +++ b/builds/linux/obs/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3391) debian; urgency=medium +lpub3d (2.4.6.3392) debian; urgency=medium - * LPub3D version 2.4.6.280.3391_20230528 for Linux + * LPub3D version 2.4.6.281.3392_20230528 for Linux - -- Trevor SANDY Sun, 28 May 2023 18:43:13 +0200 + -- Trevor SANDY Sun, 28 May 2023 18:45:15 +0200 diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc index 667384aa2..bc12c6d6e 100755 --- a/builds/linux/obs/debian/lpub3d.dsc +++ b/builds/linux/obs/debian/lpub3d.dsc @@ -2,7 +2,7 @@ Format: 1.0 Source: lpub3d Binary: lpub3d Architecture: any -Version: 2.4.6.3391 +Version: 2.4.6.3392 Maintainer: Trevor SANDY Homepage: https://trevorsandy.github.io/lpub3d/ Standards-Version: 3.9.7 diff --git a/builds/linux/obs/lpub3d.spec b/builds/linux/obs/lpub3d.spec index beecb92f3..f1161e085 100755 --- a/builds/linux/obs/lpub3d.spec +++ b/builds/linux/obs/lpub3d.spec @@ -82,7 +82,7 @@ BuildRequires: fdupes Summary: An LDraw Building Instruction Editor Name: lpub3d Icon: lpub3d.xpm -Version: 2.4.6.3391 +Version: 2.4.6.3392 Release: 1%{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -313,7 +313,7 @@ update-desktop-database || true %endif %changelog -* Sun May 28 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3391 +* Sun May 28 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3392 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670 diff --git a/builds/utilities/version.info b/builds/utilities/version.info index e982b3bf2..48c4a83de 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 4 6 280 3391 57486b7d3 +2 4 6 281 3392 baf4fc4a5 diff --git a/gitversion.pri b/gitversion.pri index 42fbdd702..0aa19337a 100644 --- a/gitversion.pri +++ b/gitversion.pri @@ -41,7 +41,7 @@ equals(GIT_DIR, undefined) { # Check if we do not have a valid version number (i.e. no version tag found) isEmpty(GIT_VERSION) { - GIT_REVISION = 280 + GIT_REVISION = 281 GIT_SHA = $$system($$GIT_BASE_COMMAND rev-parse --short HEAD 2> $$NULL_DEVICE) GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE) GIT_VERSION = v$${VERSION}-$${GIT_REVISION}-$${GIT_SHA} @@ -69,7 +69,7 @@ equals(GIT_DIR, undefined) { # Get commit count GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE) isEmpty(GIT_COMMIT) { - GIT_COMMIT = 3391 + GIT_COMMIT = 3392 message("~~~ ERROR! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~") } @@ -117,7 +117,7 @@ if (equals(USE_GIT_VER_FILE, true)|equals(USE_VERSION_INFO_VAR, true)) { GIT_VERSION = $$cat($$GIT_VER_FILE, lines) } else { message("~~~ ERROR! $$GIT_DIR_ENV VERSION_INFO FILE $$GIT_VER_FILE NOT FOUND ~~~") - GIT_VERSION = $${VERSION}.280.3391.57486b7d3 + GIT_VERSION = $${VERSION}.281.3392.baf4fc4a5 message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~") GIT_VERSION ~= s/\./" " } diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt index 4a9585ca2..67d6cb4ef 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.4.6.280.3391 (28 05 2023 18:43:13) +LPub3D 2.4.6.281.3392 (28 05 2023 18:45:15) Features, enhancements, fixes and changes ------------ diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index 3ceaae23d..1d01b308b 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -18,7 +18,7 @@
-

LPub3D 2.4.6.280.3391 (28 05 2023 18:43:13)

+

LPub3D 2.4.6.281.3392 (28 05 2023 18:45:15)

LPub3D Official release.
diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml index e32966306..893ce0bd6 100644 --- a/mainApp/extras/LPub3D_Npp_UDL.xml +++ b/mainApp/extras/LPub3D_Npp_UDL.xml @@ -14,8 +14,8 @@ ;; ;; Author......: Trevor SANDY ;; Name........: LPub3D_Npp_UDL.xml -;; Version.....: 2.4.6.280.3391 -;; Last Update.: Sun, 28 May 2023 18:43:13 +0200 +;; Version.....: 2.4.6.281.3392 +;; Last Update.: Sun, 28 May 2023 18:45:15 +0200 ;; License.....: GPLv3 ;; Homepage....: https://trevorsandy.github.io/lpub3d ;; Copyright (C) 2021 - 2023 by Trevor SANDY diff --git a/mainApp/lpub3d.qrc b/mainApp/lpub3d.qrc index 0496ee61d..fb003f375 100644 --- a/mainApp/lpub3d.qrc +++ b/mainApp/lpub3d.qrc @@ -40,6 +40,7 @@ resources/background.png resources/blendericon.png resources/blendericon16.png + resources/blenderlogo1280x720.png resources/bold.png resources/bomannotation.png resources/bomsetup.png diff --git a/mainApp/lpub_object.h b/mainApp/lpub_object.h index c619209d1..41ca3aced 100644 --- a/mainApp/lpub_object.h +++ b/mainApp/lpub_object.h @@ -145,7 +145,7 @@ class LPub : public QObject /// Load banner static void loadBanner(const int &type); - /// Download management calls + /// Download management public calls void downloadFile(QString URL, QString, bool promptRedirect = false, @@ -198,7 +198,7 @@ class LPub : public QObject /// Native export options NativeOptions *Options = nullptr; - /// Download management calls + /// Download management public members QProgressDialog *mProgressDialog = nullptr; bool mPromptRedirect; bool mHttpRequestAborted; @@ -237,7 +237,7 @@ public slots: /// Visual editor transform void saveVisualEditorTransformSettings(); - /// Download management calls + /// Download management public slots void httpDownloadFinished(); void cancelDownload(); void updateDownloadProgress(qint64, qint64); @@ -246,6 +246,7 @@ public slots: mFileLoaded = true; mFileLoadFail = !b; } + /// Update change log call void setupChangeLogUpdate(); void updaterCancelled(); @@ -272,7 +273,7 @@ private slots: void checkForUpdatesFinished(); protected: - /// Download management members + /// Download management protected members bool mShowProgress = true; QNetworkAccessManager* mHttpManager = nullptr; QNetworkReply* mHttpReply = nullptr; diff --git a/mainApp/renderdialog.cpp b/mainApp/renderdialog.cpp index b065a10d5..aefe8098e 100644 --- a/mainApp/renderdialog.cpp +++ b/mainApp/renderdialog.cpp @@ -44,20 +44,6 @@ RenderDialog::RenderDialog(QWidget* Parent, int renderType, int importOnly) mProcess = nullptr; #endif - QRegExp verRx("^(?:(\\d+)\\.)?(?:(\\d+)\\.)?(\\*|\\d+)"); - if (Preferences::blenderVersion.contains(verRx)) { - bool ok[3]; - int vMaj = verRx.cap(1).toInt(&ok[0]); - int vMin = verRx.cap(2).toInt(&ok[1]); - int vPat = verRx.cap(3).toInt(&ok[2]); - if (ok[0]) - mBlenderVersion << vMaj; - if (ok[1]) - mBlenderVersion << vMin; - if (ok[2]) - mBlenderVersion << vPat; - } - mWidth = RENDER_DEFAULT_WIDTH; mHeight = RENDER_DEFAULT_HEIGHT; @@ -122,6 +108,7 @@ RenderDialog::RenderDialog(QWidget* Parent, int renderType, int importOnly) ui->InputEdit->setText(Render::getRenderModelFile(mRenderType, false/*save current model*/)); ui->InputEdit->setEnabled(false); ui->InputBrowseButton->setEnabled(false); + ui->InputBrowseButton->setToolTip(tr("Select LDraw model file - Uncheck Generate Model to enable.")); resetInputAct = ui->InputEdit->addAction(QIcon(":/resources/resetaction.png"), QLineEdit::TrailingPosition); resetInputAct->setText(tr("Reset")); resetInputAct->setEnabled(false); @@ -162,17 +149,16 @@ RenderDialog::RenderDialog(QWidget* Parent, int renderType, int importOnly) bool blenderConfigured = !Preferences::blenderImportModule.isEmpty(); + if (blenderConfigured) + mImportModule = Preferences::blenderImportModule == QLatin1String("TN") + ? tr("LDraw Import TN") + : tr("LDraw Import MM"); + ui->RenderButton->setEnabled(blenderConfigured && mHaveKeys); ui->RenderButton->setToolTip(blenderConfigured - ? tr("Render LDraw model") - : tr("Blender not configured. Click 'Settings' to configure.")); - - mImportModule = Preferences::blenderImportModule == QLatin1String("TN") - ? tr("LDraw Import TN") - : Preferences::blenderImportModule == QLatin1String("MM") - ? tr("LDraw Import MM") - : ""; + ? tr("Render LDraw Model") + : tr("Blender not configured. Use Settings... to configure.")); if (mImportOnly) { labelMessage = tr("Open%1 in Blender using %2") @@ -183,9 +169,17 @@ RenderDialog::RenderDialog(QWidget* Parent, int renderType, int importOnly) ui->InputGenerateCheck->setMinimumWidth(0); ui->RenderButton->setText(tr("Open in Blender")); - ui->RenderButton->setToolTip(tr("Import and open LDraw model in Blender")); - ui->RenderSettingsButton->setToolTip(tr("Blender import settings")); + ui->RenderButton->setFixedWidth(ui->RenderButton->sizeHint().width() + 20); + + if (blenderConfigured) + ui->RenderButton->setToolTip(tr("Import and open LDraw model in Blender")); + ui->RenderLabel->setText(labelMessage); + ui->RenderLabel->setAlignment(Qt::AlignTrailing | Qt::AlignVCenter); + + ui->RenderSettingsButton->setToolTip(tr("Blender import settings")); + ui->RenderSettingsButton->setFixedWidth(ui->RenderButton->width()); + ui->outputLayout->setAlignment(Qt::AlignTrailing | Qt::AlignVCenter); ui->OutputLabel->hide(); ui->OutputEdit->hide(); @@ -194,30 +188,35 @@ RenderDialog::RenderDialog(QWidget* Parent, int renderType, int importOnly) ui->RenderOutputButton->hide(); ui->OutputLine->hide(); ui->RenderLine->hide(); + + setMinimumWidth(600); + adjustSize(); + ui->preview->hide(); } else { + int scaledWidth = 768; + int scaledHeight = 432; + ui->RenderSettingsButton->setToolTip(tr("Blender render settings")); - } - bool useConfigSize = false; - if (QFileInfo(Preferences::blenderLDrawConfigFile).exists()) - { - QSettings Settings(Preferences::blenderLDrawConfigFile, QSettings::IniFormat); - if (Settings.value(QString("%1/cropImage").arg(IMPORTLDRAW), QString()).toBool()) + if (QFileInfo(Preferences::blenderLDrawConfigFile).exists()) { - useConfigSize = true; - mWidth = gui->GetImageWidth(); - mHeight = gui->GetImageHeight(); + QSettings Settings(Preferences::blenderLDrawConfigFile, QSettings::IniFormat); + if (Settings.value(QString("%1/cropImage").arg(IMPORTLDRAW), QString()).toBool()) + { + scaledWidth = gui->GetImageWidth(); + scaledHeight = gui->GetImageHeight(); + } } + + QImage Image(QPixmap(":/resources/blenderlogo1280x720.png").toImage()); + Image = Image.convertToFormat(QImage::Format_ARGB32_Premultiplied); + ui->preview->setPixmap(QPixmap::fromImage(Image.scaled(scaledWidth, scaledHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation))); } - adjustSize(); - if (!mImportOnly) - setMinimumWidth(useConfigSize ? mWidth : ui->preview->geometry().width()); - ui->preview->hide(); + connect(&mUpdateTimer, SIGNAL(timeout()), this, SLOT(UpdateElapsedTime())); } connect(&mUpdateTimer, SIGNAL(timeout()), this, SLOT(Update())); - connect(&mUpdateTimer, SIGNAL(timeout()), this, SLOT(UpdateElapsedTime())); mUpdateTimer.start(500); @@ -268,10 +267,6 @@ void RenderDialog::on_RenderSettingsButton_clicked() void RenderDialog::on_RenderButton_clicked() { - if (!QFileInfo(Preferences::blenderLDrawConfigFile).isReadable() && - !Preferences::blenderImportModule.isEmpty()) - BlenderPreferences::saveSettings(); - std::function getFileContent; getFileContent = [&] () { @@ -307,10 +302,6 @@ void RenderDialog::on_RenderButton_clicked() mPreviewWidth = ui->preview->width(); mPreviewHeight = ui->preview->height(); - QImage Image(mPreviewWidth, mPreviewHeight, QImage::Format_RGB32); - Image.fill(QColor(255, 255, 255)); - ui->preview->setPixmap(QPixmap::fromImage(Image)); - mRenderTime.start(); QString message; @@ -321,6 +312,10 @@ void RenderDialog::on_RenderButton_clicked() ui->RenderLabel->setText(tr("Generating POV-Ray scene file...")); + QImage Image(mPreviewWidth, mPreviewHeight, QImage::Format_RGB32); + Image.fill(QColor(255, 255, 255)); + ui->preview->setPixmap(QPixmap::fromImage(Image)); + QApplication::processEvents(); mModelFile = Render::getRenderModelFile(mRenderType); @@ -544,7 +539,8 @@ void RenderDialog::on_RenderButton_clicked() mBlendProgValue = 0; mBlendProgMax = 0; - if (! QFileInfo(Preferences::blenderLDrawConfigFile).exists()) + if (!QFileInfo(Preferences::blenderLDrawConfigFile).isReadable() && + !Preferences::blenderImportModule.isEmpty()) BlenderPreferences::saveSettings(); QString defaultBlendFile = QString("%1/Blender/config/%2") @@ -569,7 +565,7 @@ void RenderDialog::on_RenderButton_clicked() if (Preferences::blenderImportModule == QLatin1String("MM")) pythonExpression.append(", use_ldraw_import_mm=True"); if (searchCustomDir) - pythonExpression.append(", search_additional_paths=True"); + pythonExpression.append(", search_additional_paths=True"); if (mImportOnly) { pythonExpression.append(", import_only=True"); @@ -716,7 +712,6 @@ int RenderDialog::TerminateChildProcess(const qint64 pid, const qint64 ppid) // emit gui->messageSig(LOG_DEBUG, QString("PID %1, Parent PID: %2").arg(pid).arg(ppid)); DWORD pID = DWORD(pid); DWORD ppID = DWORD(ppid); - BOOL bChild = FALSE; HANDLE hSnapshot = INVALID_HANDLE_VALUE, hProcess = INVALID_HANDLE_VALUE; PROCESSENTRY32 pe32; @@ -733,7 +728,7 @@ int RenderDialog::TerminateChildProcess(const qint64 pid, const qint64 ppid) do { if (QString::fromWCharArray(pe32.szExeFile).contains(QRegExp("^(?:cmd\\.exe|conhost\\.exe|blender\\.exe)$", Qt::CaseInsensitive))) { if ((pe32.th32ProcessID == pID && pe32.th32ParentProcessID == ppID) || // parent: cmd.exe - (bChild = pe32.th32ParentProcessID == pID)) { // children: conhost.exe, blender.exe + (pe32.th32ParentProcessID == pID)) { // children: conhost.exe, blender.exe if ((hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pe32.th32ProcessID)) == INVALID_HANDLE_VALUE) { emit gui->messageSig(LOG_ERROR, tr("%1 failed: %2").arg("OpenProcess").arg(GetLastError())); return -3; @@ -741,7 +736,7 @@ int RenderDialog::TerminateChildProcess(const qint64 pid, const qint64 ppid) TerminateProcess(hProcess, 9); CloseHandle(hProcess); emit gui->messageSig(LOG_INFO, tr("%1 Process Terminated: PID: %2 Parent PID: %3 Name: %4") - .arg(bChild ? tr("Child") : tr("Parent")) + .arg(pe32.th32ParentProcessID == pID ? tr("Child") : tr("Parent")) .arg(pe32.th32ProcessID) .arg(pe32.th32ParentProcessID) .arg(QString::fromWCharArray(pe32.szExeFile))); @@ -762,7 +757,7 @@ void RenderDialog::ReadStdOut() QString renderType; QRegExp rxRenderProgress; rxRenderProgress.setCaseSensitivity(Qt::CaseInsensitive); - bool blenderVersion3 = mBlenderVersion[0] == 3; + bool blenderVersion3 = Preferences::blenderVersion.startsWith("v3"); if (blenderVersion3) { rxRenderProgress.setPattern("Sample (\\d+)\\/(\\d+)"); @@ -804,9 +799,7 @@ QString RenderDialog::ReadStdErr(bool &hasError) const while ( ! in.atEnd()) { QString line = in.readLine(0); - returnLines << line.trimmed().replace("<","<") - .replace(">",">") - .replace("&","&") + "
"; + returnLines << line.trimmed() + "
"; if (mRenderType == POVRAY_RENDER) { if (line.contains(QRegExp("^POV-Ray finished$", Qt::CaseSensitive))) hasError = false; @@ -938,13 +931,7 @@ void RenderDialog::ShowResult() box.setWindowFlags (Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint); box.setWindowTitle(mRenderType == BLENDER_RENDER ? tr("Blender Render") : tr("POV-Ray Render")); - QString header = "" + tr ("Render Error.") + - "             " + - "             " + - "             " + - "             " + - "             " + - "            "; + QString header = "" + tr ("Render Error.") + ""; QString body = tr ("An error occurred while rendering. See Show Details..."); box.setText (header); box.setInformativeText (body); @@ -1046,9 +1033,7 @@ void RenderDialog::UpdateElapsedTime() { if (mProcess && !mImportOnly) { - QString const renderType = mBlenderVersion[0] == 3 - ? QLatin1String("Samples") - : QLatin1String("Tiles"); + QString const renderType = Preferences::blenderVersion.startsWith("v3") ? QLatin1String("Samples") : QLatin1String("Tiles"); ui->RenderLabel->setText(tr("%1: %2/%3, %4") .arg(renderType) .arg(mBlendProgValue) @@ -1105,9 +1090,10 @@ bool RenderDialog::PromptCancel() WriteStdOut(); ui->RenderOutputButton->setEnabled(true); } - ui->RenderLabel->setText(tr("Tiles: %1/%2, Render Cancelled.") - .arg(mBlendProgValue) - .arg(mBlendProgMax)); + if (mRenderType == BLENDER_RENDER) + ui->RenderLabel->setText(tr("Tiles: %1/%2, Render Cancelled.") + .arg(mBlendProgValue) + .arg(mBlendProgMax)); } else return false; diff --git a/mainApp/renderdialog.h b/mainApp/renderdialog.h index 66c99b8ec..381e2eeec 100644 --- a/mainApp/renderdialog.h +++ b/mainApp/renderdialog.h @@ -32,9 +32,10 @@ class RenderProcess : public QProcess Q_OBJECT public: - explicit RenderProcess( - QObject *parent = nullptr) : - QProcess(parent){} + explicit RenderProcess(QObject *parent = nullptr) + : QProcess(parent) + { + } ~RenderProcess(); }; @@ -102,7 +103,6 @@ protected slots: bool mHaveKeys; bool mTransBackground; - QVector mBlenderVersion; int mWidth; int mHeight; int mResolution; diff --git a/mainApp/resources/blenderlogo1280x720.png b/mainApp/resources/blenderlogo1280x720.png new file mode 100644 index 000000000..e0f303deb Binary files /dev/null and b/mainApp/resources/blenderlogo1280x720.png differ