From 9514f057dcb5cebdd7cfd235f4fcc97340a1fcd1 Mon Sep 17 00:00:00 2001 From: Alex Shvartzkop Date: Mon, 10 Jul 2023 20:16:08 +0500 Subject: [PATCH] Non-Windows uses libs3d_plugin prefix for S3D plugins. https://gitlab.com/kicad/code/kicad/-/issues/12871 (cherry picked from commit e43c8fcf6b37457b1df2c16213ae8dcbcf7e544d) --- 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 daa9324176..3317e84983 100644 --- a/3d-viewer/3d_cache/3d_plugin_manager.cpp +++ b/3d-viewer/3d_cache/3d_plugin_manager.cpp @@ -297,8 +297,11 @@ void S3D_PLUGIN_MANAGER::checkPluginName( const wxString& aPath, // prevent loading non-plugin dlls if( wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) ) { - if( !path.GetName().StartsWith( "s3d_plugin" ) ) + if( !path.GetName().StartsWith( "s3d_plugin" ) + && !path.GetName().StartsWith( "libs3d_plugin" ) ) + { return; + } } aPluginList.push_back( wxpath );