From 75e1846cf81f7f1def39050aaef8d58b7244e2c0 Mon Sep 17 00:00:00 2001 From: Trevor SANDY Date: Mon, 19 Jun 2023 17:40:23 +0200 Subject: [PATCH] Blender LDraw Render - preferences addons on successive open #416 --- builds/linux/obs/PKGBUILD | 2 +- builds/linux/obs/alldeps/PKGBUILD | 2 +- builds/linux/obs/alldeps/debian/changelog | 6 +++--- builds/linux/obs/alldeps/debian/lpub3d.dsc | 2 +- builds/linux/obs/alldeps/lpub3d.spec | 4 ++-- builds/linux/obs/debian/changelog | 6 +++--- builds/linux/obs/debian/lpub3d.dsc | 2 +- builds/linux/obs/lpub3d.spec | 4 ++-- builds/utilities/version.info | 2 +- gitversion.pri | 6 +++--- mainApp/docs/README.txt | 2 +- mainApp/docs/RELEASE_NOTES.html | 2 +- mainApp/extras/LPub3D_Npp_UDL.xml | 4 ++-- mainApp/preferencesdialog.cpp | 5 +++-- 14 files changed, 25 insertions(+), 24 deletions(-) diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD index 8c5f1b45c..1d959f56d 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.3471 +pkgver=2.4.6.3472 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 54fe51615..319ee224a 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.3471 +pkgver=2.4.6.3472 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 8cf4d7421..e500f188d 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3471) debian; urgency=medium +lpub3d (2.4.6.3472) debian; urgency=medium - * LPub3D version 2.4.6.360.3471_20230619 for Linux + * LPub3D version 2.4.6.361.3472_20230619 for Linux - -- Trevor SANDY Mon, 19 Jun 2023 17:38:14 +0200 + -- Trevor SANDY Mon, 19 Jun 2023 17:40:24 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index 912cb1fd1..b5772d6a9 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.3471 +Version: 2.4.6.3472 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 dcab2085d..0c70bd0e7 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.3471 +Version: 2.4.6.3472 Release: %{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -797,7 +797,7 @@ update-desktop-database || true %endif %changelog -* Mon Jun 19 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3471 +* Mon Jun 19 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3472 - 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 48063124e..c8d9d0479 100644 --- a/builds/linux/obs/debian/changelog +++ b/builds/linux/obs/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3471) debian; urgency=medium +lpub3d (2.4.6.3472) debian; urgency=medium - * LPub3D version 2.4.6.360.3471_20230619 for Linux + * LPub3D version 2.4.6.361.3472_20230619 for Linux - -- Trevor SANDY Mon, 19 Jun 2023 17:38:16 +0200 + -- Trevor SANDY Mon, 19 Jun 2023 17:40:25 +0200 diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc index 521fd3aec..220656941 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.3471 +Version: 2.4.6.3472 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 dd4c0ea71..1c7222d55 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.3471 +Version: 2.4.6.3472 Release: 1%{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -313,7 +313,7 @@ update-desktop-database || true %endif %changelog -* Mon Jun 19 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3471 +* Mon Jun 19 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3472 - 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 34686d660..3848c85b2 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 4 6 360 3471 64695cb65 +2 4 6 361 3472 e729ed0bc diff --git a/gitversion.pri b/gitversion.pri index e486ebe71..d9fe90147 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 = 360 + GIT_REVISION = 361 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 = 3471 + GIT_COMMIT = 3472 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}.360.3471.64695cb65 + GIT_VERSION = $${VERSION}.361.3472.e729ed0bc 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 399fe89cc..61ef6a3f4 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.4.6.360.3471 (19 06 2023 17:38:16) +LPub3D 2.4.6.361.3472 (19 06 2023 17:40:25) Features, enhancements, fixes and changes ------------ diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index cd0a5397b..01ecd3860 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -18,7 +18,7 @@
-

LPub3D 2.4.6.360.3471 (19 06 2023 17:38:16)

+

LPub3D 2.4.6.361.3472 (19 06 2023 17:40:25)

LPub3D Official release.
diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml index 496475163..f8530bcc4 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.360.3471 -;; Last Update.: Mon, 19 Jun 2023 17:38:16 +0200 +;; Version.....: 2.4.6.361.3472 +;; Last Update.: Mon, 19 Jun 2023 17:40:25 +0200 ;; License.....: GPLv3 ;; Homepage....: https://trevorsandy.github.io/lpub3d ;; Copyright (C) 2021 - 2023 by Trevor SANDY diff --git a/mainApp/preferencesdialog.cpp b/mainApp/preferencesdialog.cpp index 04301ceec..6dbfe2361 100644 --- a/mainApp/preferencesdialog.cpp +++ b/mainApp/preferencesdialog.cpp @@ -179,6 +179,9 @@ PreferencesDialog::PreferencesDialog(QWidget* _parent) : ui.browseLDView->hide(); ui.browsePOVRAY->hide(); + // setup Blender addon renderer + setBlenderAddonPreferences(); + /* Themes */ ui.themeCombo->addItem(THEME_DEFAULT); ui.themeCombo->addItem(THEME_DARK); @@ -397,8 +400,6 @@ void PreferencesDialog::setPreferences() // end preferred renderer - setBlenderAddonPreferences(); - ui.fadeStepsUseColourGrpBox->setTitle( fadeStepsColorTitle); ui.pliControlEdit->setText( Preferences::pliControlFile); ui.altLDConfigPath->setText( Preferences::altLDConfigPath);