haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move default model location to 3dmodels

This commit is contained in:
Seth Hillbrand 2020-10-14 11:01:02 -07:00
parent 1c5aad1f9e
commit e684c6d94d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/kiface_i.cpp
View File

@ -66,13 +66,12 @@ static void setSearchPaths( SEARCH_STACK* aDst, KIWAY::FACE_T aId )
{ {
fn.AppendDir( wxT( "modules" ) ); fn.AppendDir( wxT( "modules" ) );
aDst->AddPaths( fn.GetPath() ); aDst->AddPaths( fn.GetPath() );
fn.RemoveLastDir();
// Add 3D module library file path to search path list. // Add 3D module library file path to search path list.
fn.AppendDir( wxT( "packages3d" ) ); fn.AppendDir( wxT( "3dmodels" ) );
aDst->AddPaths( fn.GetPath() ); aDst->AddPaths( fn.GetPath() );
fn.RemoveLastDir(); fn.RemoveLastDir();
fn.RemoveLastDir(); // "../../" up twice, remove modules/packages3d
} }
// Add KiCad template file path to search path list. // Add KiCad template file path to search path list.

3
common/pgm_base.cpp
View File

@ -327,7 +327,8 @@ bool PGM_BASE::InitPgm()
} }
else else
{ {
tmpFileName.AppendDir( "packages3d" ); tmpFileName = baseSharePath;
tmpFileName.AppendDir( "3dmodels" );
envVarItem.SetDefinedExternally( false ); envVarItem.SetDefinedExternally( false );
} }