From b95a7aef1972705eab99f34a56ff4f33c0e7b3ed Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Tue, 1 Aug 2017 21:13:15 +0200 Subject: [PATCH] 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. --- radiant/mainframe.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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() ); GlobalCommands_insert( "ExportSelected", FreeCaller() ); GlobalCommands_insert( "SaveRegion", FreeCaller() ); - GlobalCommands_insert( "RefreshReferences", FreeCaller() ); + GlobalCommands_insert( "RefreshReferences", FreeCaller() ); GlobalCommands_insert( "ProjectSettings", FreeCaller() ); GlobalCommands_insert( "Exit", FreeCaller() ); -- 2.39.2