From 29d7829909e06749199dd8b1576eff528477e08c Mon Sep 17 00:00:00 2001 From: Cirilo Bernardo Date: Wed, 6 Jan 2016 20:05:29 +1100 Subject: [PATCH] Fix for MSWin (plugins not found) --- 3d-viewer/3d_cache/3d_plugin_manager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3d-viewer/3d_cache/3d_plugin_manager.cpp b/3d-viewer/3d_cache/3d_plugin_manager.cpp index 8081712ed1..efac43e1b8 100644 --- a/3d-viewer/3d_cache/3d_plugin_manager.cpp +++ b/3d-viewer/3d_cache/3d_plugin_manager.cpp @@ -133,10 +133,13 @@ void S3D_PLUGIN_MANAGER::loadPlugins( void ) checkPluginPath( testpath, searchpaths ); #endif - fn.Assign( wxStandardPaths::Get().GetPluginsDir() ); #ifndef _WIN32 // suppress 'kicad' subdir since it is redundant on MSWin + fn.Assign( wxStandardPaths::Get().GetPluginsDir() ); fn.AppendDir( wxT( "kicad" ) ); + #else + fn.Assign( wxStandardPaths::Get().GetExecutablePath() ); #endif + fn.AppendDir( wxT( "plugins" ) ); fn.AppendDir( wxT( "3d" ) ); checkPluginPath( std::string( fn.GetPathWithSep().ToUTF8() ), searchpaths );