From 38e1e780a8720bd37a08ad9a85b8add371db4086 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Tue, 14 Sep 2021 14:47:35 +0100
Subject: [PATCH] Use EnvVar resolver not full resolver when expanding 3D
 search paths.

Fixes https://gitlab.com/kicad/code/kicad/issues/7670
---
 common/filename_resolver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/filename_resolver.cpp b/common/filename_resolver.cpp
index 016838e1dd..4f84f02f3c 100644
--- a/common/filename_resolver.cpp
+++ b/common/filename_resolver.cpp
@@ -634,7 +634,7 @@ bool FILENAME_RESOLVER::WritePathList( const wxString& aDir, const wxString& aFi
         cfgFile << "\"" << tstr.size() << ":" << tstr << "\",";
 
         if( aResolvePaths )
-            tstr = ResolvePath( sPL->m_Pathvar ).ToUTF8();
+            tstr = ExpandEnvVarSubstitutions( sPL->m_Pathvar, m_project ).ToUTF8();
         else
             tstr = sPL->m_Pathvar.ToUTF8();