From: Thomas Debesse <dev@illwieckz.net>
Date: Tue, 1 Aug 2017 19:13:15 +0000 (+0200)
Subject: refresh VFS on model refresh, refresh models on VFS refresh
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F72%2Fhead;p=xonotic%2Fnetradiant.git

refresh VFS on model refresh, refresh models on VFS refresh

Before:

- refreshing textures were refreshing VFS (to load enabled texture packs)
  but models were not refreshed
- refreshing textures were refreshing models but textures would be missing
  since the VFS was not refreshed and texture packs would be not loaded

After:

- refreshing textures or models both refresh VFS, textures and models,
  this way you don't anymore reload models without refreshing textures, or
  refresh VFS without reloading models, etc.
---

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 8d652ef2..92e1960a 100644
--- 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>() );