Fade and highlight - spurious LPUB_FADE, LPUB_HIGHLIGHT warning #710

trevorsandy · Jun 19, 2023 · e729ed0 · e729ed0
1 parent 64695cb
commit e729ed0
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 32 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.3470
+pkgver=2.4.6.3471
 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.3470
+pkgver=2.4.6.3471
 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.3470) debian; urgency=medium
+lpub3d (2.4.6.3471) debian; urgency=medium
 
-  * LPub3D version 2.4.6.359.3470_20230619 for Linux
+  * LPub3D version 2.4.6.360.3471_20230619 for Linux
 
- -- Trevor SANDY <[email protected]>  Mon, 19 Jun 2023 17:36:02 +0200
+ -- Trevor SANDY <[email protected]>  Mon, 19 Jun 2023 17:38:14 +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.3470
+Version: 2.4.6.3471
 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.3470
+Version: 2.4.6.3471
 Release: <B_CNT>%{?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.3470
+* Mon Jun 19 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3471
 - 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.3470) debian; urgency=medium
+lpub3d (2.4.6.3471) debian; urgency=medium
 
-  * LPub3D version 2.4.6.359.3470_20230619 for Linux
+  * LPub3D version 2.4.6.360.3471_20230619 for Linux
 
- -- Trevor SANDY <[email protected]>  Mon, 19 Jun 2023 17:36:04 +0200
+ -- Trevor SANDY <[email protected]>  Mon, 19 Jun 2023 17:38:16 +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.3470
+Version: 2.4.6.3471
 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.3470
+Version: 2.4.6.3471
 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.3470
+* Mon Jun 19 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3471
 - 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 359 3470 221bb9b14
+2 4 6 360 3471 64695cb65
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 = 359
+        GIT_REVISION = 360
         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 = 3470
+            GIT_COMMIT = 3471
             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}.359.3470.221bb9b14
+            GIT_VERSION = $${VERSION}.360.3471.64695cb65
             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
@@ -1,4 +1,4 @@
-LPub3D 2.4.6.359.3470 (19 06 2023 17:36:04)
+LPub3D 2.4.6.360.3471 (19 06 2023 17:38:16)
 
 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.359.3470 (19 06 2023 17:36:04)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.360.3471 (19 06 2023 17:38:16)</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.359.3470
-;; Last Update.: Mon, 19 Jun 2023 17:36:04 +0200
+;; Version.....: 2.4.6.360.3471
+;; Last Update.: Mon, 19 Jun 2023 17:38:16 +0200
 ;; License.....: GPLv3
 ;; Homepage....: https://trevorsandy.github.io/lpub3d
 ;; Copyright (C) 2021 - 2023 by Trevor SANDY

diff --git a/mainApp/lpub_object.cpp b/mainApp/lpub_object.cpp
@@ -637,11 +637,12 @@ bool LPub::setFadeStepsFromCommand()
   if (lpubFade) {
     if (result != QLatin1String("GLOBAL"))
       emit lpub->messageSig(LOG_WARNING,tr("Top level LPUB_FADE command missing GLOBAL qualifier."),true/*Show Dialog*/);
-  } else if (Preferences::preferredRenderer != RENDERER_NATIVE) {
-    emit lpub->messageSig(LOG_WARNING,tr("LPUB_FADE command IGNORED.<br>"
-                                         "LPUB_FADE command requires preferred render RENDERER_NATIVE.<br>"
-                                         "PREFERRED_RENDERER command must precede LPUB_FADE."),true/*Show Dialog*/);
-    lpubFade = true;
+    if (!nativeRenderer) {
+      emit lpub->messageSig(LOG_WARNING,tr("LPUB_FADE command IGNORED.<br>"
+                                           "LPUB_FADE command requires preferred render RENDERER_NATIVE.<br>"
+                                           "PREFERRED_RENDERER command must precede LPUB_FADE."),true/*Show Dialog*/);
+      lpubFade = false;
+    }
   }
 
   if (!Preferences::enableFadeSteps) {
@@ -740,11 +741,12 @@ bool LPub::setHighlightStepFromCommand()
   if (lpubHighlight) {
     if (result != QLatin1String("GLOBAL"))
       emit lpub->messageSig(LOG_WARNING,tr("Top level LPUB_FADE command missing GLOBAL qualifier."),true/*Show Dialog*/);
-  } else if (Preferences::preferredRenderer != RENDERER_NATIVE) {
-    emit lpub->messageSig(LOG_WARNING,tr("LPUB_HIGHLIGHT command IGNORED.<br>"
-                                         "LPUB_HIGHLIGHT command requires preferred render RENDERER_NATIVE.<br>"
-                                         "PREFERRED_RENDERER command must precede LPUB_HIGHLIGHT."),true/*Show Dialog*/);
-    lpubHighlight = true;
+    if (!nativeRenderer) {
+      emit lpub->messageSig(LOG_WARNING,tr("LPUB_HIGHLIGHT command IGNORED.<br>"
+                                           "LPUB_HIGHLIGHT command requires preferred render RENDERER_NATIVE.<br>"
+                                           "PREFERRED_RENDERER command must precede LPUB_HIGHLIGHT."),true/*Show Dialog*/);
+      lpubHighlight = false;
+    }
   }
 
   if (!Preferences::enableHighlightStep) {