From df26bef2aaa33469b9fe2a3ceaa31bdfbcddb7d2 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Wed, 22 Jan 2025 12:19:33 +0100
Subject: [PATCH] EgtCAM5 2.7a2 : - piccola modifica per consentire di
 importare BTL con feature Variant definite tramite script lua.

---
 MainWindow/MainWindowVM.vb | 16 ++++++++--------
 My Project/AssemblyInfo.vb |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index d36117c..c56b042 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -422,14 +422,6 @@ Public Class MainWindowVM
       GetPrivateProfileString(S_GEOMDB, K_NFEFONTDIR, "", sNfeDir)
       GetPrivateProfileString(S_GEOMDB, K_DEFAULTFONT, "", OptionModule.m_sFontText)
       EgtSetFont(sNfeDir, OptionModule.m_sFontText)
-      ' Imposto direttorio ausiliario per import/gestione BTL
-      Dim sBtlAuxDir As String = String.Empty
-      GetPrivateProfileString(S_IMPORT, K_BTLAUXDIR, "", sBtlAuxDir)
-      EgtSetBtlAuxDir(sBtlAuxDir)
-      ' Imposto direttorio libreria per export ThreeJs
-      Dim sThreeJSLibDir As String = String.Empty
-      GetPrivateProfileString(S_EXPORT, K_THREEJSLIBDIR, "", sThreeJSLibDir)
-      EgtSetThreeJSLibDir(sThreeJSLibDir)
       ' Imposto dir di default per libreria Lua e lancio libreria di base
       Dim sLuaLibsDir As String = String.Empty
       GetPrivateProfileString(S_LUA, K_LIBSDIR, "", sLuaLibsDir)
@@ -437,6 +429,14 @@ Public Class MainWindowVM
       Dim sLuaBaseLib As String = String.Empty
       GetPrivateProfileString(S_LUA, K_BASELIB, "EgtBase", sLuaBaseLib)
       EgtLuaRequire(sLuaBaseLib)
+      ' Imposto direttorio ausiliario per import/gestione BTL (sempre dopo impostazioni lua)
+      Dim sBtlAuxDir As String = String.Empty
+      GetPrivateProfileString(S_IMPORT, K_BTLAUXDIR, "", sBtlAuxDir)
+      EgtSetBtlAuxDir(sBtlAuxDir)
+      ' Imposto direttorio libreria per export ThreeJs
+      Dim sThreeJSLibDir As String = String.Empty
+      GetPrivateProfileString(S_EXPORT, K_THREEJSLIBDIR, "", sThreeJSLibDir)
+      EgtSetThreeJSLibDir(sThreeJSLibDir)
       ' Imposto direttorio temporaneo a EgtInterface
       EgtSetTempDir(m_sTempDir)
       ' Imposto IniFile a EgtInterface
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 323e2dd..1aca076 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.7.1.1")>
-<Assembly: AssemblyFileVersion("2.7.1.1")>
+<Assembly: AssemblyVersion("2.7.1.2")>
+<Assembly: AssemblyFileVersion("2.7.1.2")>