Merge branch 'filternonshader' into 'master'

filter non-shader texture paths at the same place

See merge request xonotic/netradiant!94

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 05464649dc6e3984192bb743cad2d0de198f0949..11fc3784ad2b49874caf4de899880017bffc55bd 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -154,7 +154,7 @@ void VFS_Refresh()
     QE_InitVFS();
     GlobalFileSystem().refresh();
     g_vfsInitialized = true;
-    // also refresg models
+    // also refresh models
     RefreshReferences();
     // also refresh texture browser
     TextureBrowser_RefreshShaders();

diff --git a/radiant/map.cpp b/radiant/map.cpp
index adf69f46d974fac354bf0e3a097ae90775ac7596..2cecfe3cd81bc572af7b0c7299a69ac487ba6bdd 100644 (file)
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -1050,9 +1050,9 @@ void Map_LoadFile(const char *filename)
 
     g_currentMap = &g_map;
 
-    // restart VFS to apply new pak filtering based on mapname
+    // refresh VFS to apply new pak filtering based on mapname
     // needed for daemon DPK VFS
-    VFS_Restart();
+    VFS_Refresh();
 }
 
 class Excluder {
@@ -1641,7 +1641,7 @@ bool Map_ImportFile(const char *filename)
 
     tryDecompile:
 
-    const char *type = GlobalRadiant().getRequiredGameDescriptionKeyValue("q3map2_type");
+    const char *type = GlobalRadiant().getGameDescriptionKeyValue("q3map2_type");
     int n = string_length(path_get_extension(filename));
     if (n && (extension_equal(path_get_extension(filename), "bsp") ||
               extension_equal(path_get_extension(filename), "map"))) {