Merge branch 'vfsmodels' into 'master'

refresh VFS on model refresh, refresh models on VFS refresh

See merge request !72

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 8d652ef2fa25ffdf3102cde25d91475cd0f04d3d..92e1960ab8543f4c18617023fe48e0ec450e177d 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -148,6 +148,8 @@ void VFS_Refresh(){
        QE_InitVFS();
        GlobalFileSystem().refresh();
        g_vfsInitialized = true;
+       // also refresg models
+       RefreshReferences();
        // also refresh texture browser
        TextureBrowser_RefreshShaders();
 }
@@ -3180,7 +3182,7 @@ void MainFrame_Construct(){
        GlobalCommands_insert( "SaveMapAs", FreeCaller<SaveMapAs>() );
        GlobalCommands_insert( "ExportSelected", FreeCaller<ExportMap>() );
        GlobalCommands_insert( "SaveRegion", FreeCaller<SaveRegion>() );
-       GlobalCommands_insert( "RefreshReferences", FreeCaller<RefreshReferences>() );
+       GlobalCommands_insert( "RefreshReferences", FreeCaller<VFS_Refresh>() );
        GlobalCommands_insert( "ProjectSettings", FreeCaller<DoProjectSettings>() );
        GlobalCommands_insert( "Exit", FreeCaller<Exit>() );