Blender LDraw Render - append PATH_ prefex to path enum #416

trevorsandy · May 28, 2023 · bb4a9ff · bb4a9ff
1 parent cb3d62b
commit bb4a9ff
Show file tree

Hide file tree

Showing 15 changed files with 81 additions and 81 deletions.
diff --git 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.3388
+pkgver=2.4.6.3389
 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
@@ -2,7 +2,7 @@
 #  Last Update: July 19, 2020
 #  Copyright (C) 2017 - 2023 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.6.3388
+pkgver=2.4.6.3389
 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
@@ -1,5 +1,5 @@
-lpub3d (2.4.6.3388) debian; urgency=medium
+lpub3d (2.4.6.3389) debian; urgency=medium
 
-  * LPub3D version 2.4.6.277.3388_20230528 for Linux
+  * LPub3D version 2.4.6.278.3389_20230528 for Linux
 
- -- Trevor SANDY <[email protected]>  Sun, 28 May 2023 18:37:11 +0200
+ -- Trevor SANDY <[email protected]>  Sun, 28 May 2023 18:39:07 +0200
diff --git 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.3388
+Version: 2.4.6.3389
 Maintainer: Trevor SANDY <[email protected]>
 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
@@ -120,7 +120,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.6.3388
+Version: 2.4.6.3389
 Release: <B_CNT>%{?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.3388
+* Sun May 28 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3389
 - 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
@@ -1,5 +1,5 @@
-lpub3d (2.4.6.3388) debian; urgency=medium
+lpub3d (2.4.6.3389) debian; urgency=medium
 
-  * LPub3D version 2.4.6.277.3388_20230528 for Linux
+  * LPub3D version 2.4.6.278.3389_20230528 for Linux
 
- -- Trevor SANDY <[email protected]>  Sun, 28 May 2023 18:37:12 +0200
+ -- Trevor SANDY <[email protected]>  Sun, 28 May 2023 18:39:08 +0200
diff --git 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.3388
+Version: 2.4.6.3389
 Maintainer: Trevor SANDY <[email protected]>
 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
@@ -82,7 +82,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.6.3388
+Version: 2.4.6.3389
 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.3388
+* Sun May 28 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3389
 - 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
@@ -1 +1 @@
-2 4 6 277 3388 fd4679cf7
+2 4 6 278 3389 cb3d62bae
diff --git 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 = 277
+        GIT_REVISION = 278
         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 = 3388
+            GIT_COMMIT = 3389
             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}.277.3388.fd4679cf7
+            GIT_VERSION = $${VERSION}.278.3389.cb3d62bae
             message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
             GIT_VERSION ~= s/\./" "
         }

diff --git a/mainApp/blenderpreferences.cpp b/mainApp/blenderpreferences.cpp
diff --git a/mainApp/blenderpreferences.h b/mainApp/blenderpreferences.h
@@ -182,16 +182,16 @@ private slots:
 
     enum BlenderRenPathType
     {
-        LBL_BLENDER_PATH,                       //  0 QLineEdit/QPushButton
-        LBL_BLENDFILE_PATH,                     //  1 QLineEdit/QPushButton
-        LBL_ENVIRONMENT_PATH,                   //  2 QLineEdit/QPushButton
-        LBL_LDCONFIG_PATH,                      //  3 QLineEdit/QPushButton
-        LBL_LDRAW_PATH,                         //  4 QLineEdit/QPushButton
-        LBL_LSYNTH_PATH,                        //  5 QLineEdit/QPushButton
-        LBL_STUD_LOGO_PATH,                     //  6 QLineEdit/QPushButton
-        LBL_STUDIO_LDRAW_PATH,                  //  7 QLineEdit/QPushButton
-
-        NUM_BLENDER_PATHS
+        PATH_BLENDER,       //  0 QLineEdit/QPushButton
+        PATH_BLENDFILE,     //  1 QLineEdit/QPushButton
+        PATH_ENVIRONMENT,   //  2 QLineEdit/QPushButton
+        PATH_LDCONFIG,      //  3 QLineEdit/QPushButton
+        PATH_LDRAW,         //  4 QLineEdit/QPushButton
+        PATH_LSYNTH,        //  5 QLineEdit/QPushButton
+        PATH_STUD_LOGO,     //  6 QLineEdit/QPushButton
+        PATH_STUDIO_LDRAW,  //  7 QLineEdit/QPushButton
+
+        NUM_PATH_ITEMS
     };
 
     enum BlenderRenLabelType

diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.6.277.3388 (28 05 2023 18:37:12)
+LPub3D 2.4.6.278.3389 (28 05 2023 18:39:08)
 
 Features, enhancements, fixes and changes
 ------------

diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html
@@ -18,7 +18,7 @@
 <table class="tg">
   <tr>
     <th class="tg-0pky">
-      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.277.3388 (28 05 2023 18:37:12)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.278.3389 (28 05 2023 18:39:08)</h4>
         <hr>
           <p>
              <span class="tg-1pky">LPub3D Official release.</span><br>

diff --git 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.277.3388
-;; Last Update.: Sun, 28 May 2023 18:37:12 +0200
+;; Version.....: 2.4.6.278.3389
+;; Last Update.: Sun, 28 May 2023 18:39:08 +0200
 ;; License.....: GPLv3
 ;; Homepage....: https://trevorsandy.github.io/lpub3d
 ;; Copyright (C) 2021 - 2023 by Trevor SANDY