Move default model location to 3dmodels

common/kiface_i.cpp

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

common/pgm_base.cpp

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