diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD index 44bac66f0..9180463fe 100644 --- a/builds/linux/obs/alldeps/PKGBUILD +++ b/builds/linux/obs/alldeps/PKGBUILD @@ -2,7 +2,7 @@ # Last Update: July 23, 2019 # Copyright (c) 2017 - 2020 by Trevor SANDY pkgname=lpub3d -pkgver=2.4.0.1815 +pkgver=2.4.0.1816 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 f2e1c201e..9802e3165 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.0.1815) debian; urgency=medium +lpub3d (2.4.0.1816) debian; urgency=medium - * LPub3D version 2.4.0.1.1815_20200920 for Linux + * LPub3D version 2.4.0.1.1816_20200920 for Linux - -- Trevor SANDY Sun, 20 Sep 2020 10:45:48 +0200 + -- Trevor SANDY Sun, 20 Sep 2020 10:46:28 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index cd3a2148c..6b82ad464 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.0.1815 +Version: 2.4.0.1816 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 654760ab7..3c7c48be2 100644 --- a/builds/linux/obs/alldeps/lpub3d.spec +++ b/builds/linux/obs/alldeps/lpub3d.spec @@ -116,7 +116,7 @@ BuildRequires: fdupes Summary: An LDraw Building Instruction Editor Name: lpub3d Icon: lpub3d.xpm -Version: 2.4.0.1815 +Version: 2.4.0.1816 Release: %{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -728,5 +728,5 @@ update-mime-database /usr/share/mime >/dev/null || true update-desktop-database || true %endif -* Sun Sep 20 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1815 +* Sun Sep 20 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1816 - LPub3D Linux package (rpm) release diff --git a/builds/utilities/ci/secure/.secrets.tar.enc b/builds/utilities/ci/secure/.secrets.tar.enc index 881b548a3..b07cdbb22 100644 Binary files a/builds/utilities/ci/secure/.secrets.tar.enc and b/builds/utilities/ci/secure/.secrets.tar.enc differ diff --git a/builds/utilities/version.info b/builds/utilities/version.info index 38a877a3d..342a85253 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 4 0 1 1815 8839916 +2 4 0 1 1816 fcf85b6 diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt index a9804f6ab..77d1e474f 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.4.0.1.1815 (20 09 2020 10:45:48) +LPub3D 2.4.0.1.1816 (20 09 2020 10:46:28) Features, enhancements, fixes and changes ------------ diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index dc7d2702b..9898f257f 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -9,7 +9,7 @@
-

LPub3D 2.4.0.1.1815 (20 09 2020 10:45:48)

+

LPub3D 2.4.0.1.1816 (20 09 2020 10:46:28)

LPub3D Continuous release.
diff --git a/mainApp/lpub_preferences.cpp b/mainApp/lpub_preferences.cpp index d5527ed92..0423c092c 100644 --- a/mainApp/lpub_preferences.cpp +++ b/mainApp/lpub_preferences.cpp @@ -245,7 +245,6 @@ bool Preferences::customSceneRulerTickColor = false; bool Preferences::customSceneRulerTrackingColor = false; bool Preferences::customSceneGuideColor = false; bool Preferences::debugLogging = false; -bool Preferences::enableLineTypeIndexes = true; bool Preferences::blenderIs28OrLater = true; bool Preferences::defaultBlendFile = false; bool Preferences::useSystemEditor = false; diff --git a/mainApp/lpub_preferences.h b/mainApp/lpub_preferences.h index cd5252a04..d24b612d9 100644 --- a/mainApp/lpub_preferences.h +++ b/mainApp/lpub_preferences.h @@ -295,7 +295,6 @@ class Preferences static bool customSceneRulerTrackingColor; static bool customSceneGuideColor; static bool debugLogging; - static bool enableLineTypeIndexes; static bool useSystemEditor; #ifdef Q_OS_MAC diff --git a/mainApp/org.trevorsandy.lpub3d.appdata.xml b/mainApp/org.trevorsandy.lpub3d.appdata.xml index 05ccc3e05..b7afa6a2c 100644 --- a/mainApp/org.trevorsandy.lpub3d.appdata.xml +++ b/mainApp/org.trevorsandy.lpub3d.appdata.xml @@ -68,7 +68,7 @@ lpub3d24 ​ - +

LPub3D Linux AppImage package

diff --git a/mainApp/traverse.cpp b/mainApp/traverse.cpp index 167a94f67..26088a6bb 100644 --- a/mainApp/traverse.cpp +++ b/mainApp/traverse.cpp @@ -87,6 +87,7 @@ static QString PositionNames[] = * ldraw file held in the the ldr string * ********************************************/ +static bool enableLineTypeIndexes; static void remove_group( QStringList in, // csiParts @@ -103,7 +104,7 @@ static void remove_group( QRegExp grpRx; if (in.size() != tin.size()) { - Preferences::enableLineTypeIndexes = false; + enableLineTypeIndexes = false; QString message(QString("CSI part list size [%1] does not match line index size [%2]. Line type indexes disabled.") .arg(in.size()).arg(tin.size())); emit gui->messageSig(LOG_NOTICE, message); @@ -202,7 +203,7 @@ static void remove_parttype( model = model.toLower(); if (in.size() != tin.size()) { - Preferences::enableLineTypeIndexes = false; + enableLineTypeIndexes = false; QString message(QString("CSI part list size [%1] does not match line index size [%2]. Line type indexes disabled.") .arg(in.size()).arg(tin.size())); emit gui->messageSig(LOG_NOTICE, message); @@ -245,7 +246,7 @@ static void remove_partname( name = name.toLower(); if (in.size() != tin.size()) { - Preferences::enableLineTypeIndexes = false; + enableLineTypeIndexes = false; QString message(QString("CSI part list size [%1] does not match line index size [%2]. Line type indexes disabled.") .arg(in.size()).arg(tin.size())); emit gui->messageSig(LOG_NOTICE, message); @@ -3491,7 +3492,7 @@ void Gui::drawPage( savePrevStepPosition = 0; saveContStepNum = 1; - Preferences::enableLineTypeIndexes = true; + enableLineTypeIndexes = true; PgSizeData pageSize; if (exporting()) {