From 3a8a718e43693b6394641c571275451d7e7a1d67 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Mon, 21 May 2018 00:18:06 +0100 Subject: [PATCH] A pesky bug, this one is. (Said in best Yoda impression.) There were two examples of the somewhat annoying error message. This gets the second one. Fixes: lp:1772255 * https://bugs.launchpad.net/kicad/+bug/1772255 --- 3d-viewer/3d_cache/3d_filename_resolver.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/3d-viewer/3d_cache/3d_filename_resolver.cpp b/3d-viewer/3d_cache/3d_filename_resolver.cpp index afc9890e98..f100c3d271 100644 --- a/3d-viewer/3d_cache/3d_filename_resolver.cpp +++ b/3d-viewer/3d_cache/3d_filename_resolver.cpp @@ -307,22 +307,6 @@ wxString S3D_FILENAME_RESOLVER::ResolvePath( const wxString& aFileName ) return tname; } - // if a path begins with ${ENV_VAR}/$(ENV_VAR) and is not resolved then the - // file either does not exist or the ENV_VAR is not defined - if( aFileName.StartsWith( "${" ) || aFileName.StartsWith( "$(" ) ) - { - if( !( m_errflags & ERRFLG_ENVPATH ) ) - { - m_errflags |= ERRFLG_ENVPATH; - wxString errmsg = "[3D File Resolver] No such path; ensure the environment var is defined"; - errmsg.append( "\n" ); - errmsg.append( tname ); - wxLogMessage( errmsg ); - } - - return wxEmptyString; - } - // at this point aFileName is: // a. an aliased shortened name or // b. cannot be determined