From 0fd04ccf85fe3a01072607cbd158c27150136ef8 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Mon, 28 Aug 2017 02:27:06 +0200 Subject: [PATCH] always provide notex This adds a special VFS providing textures/radiant/notex and shadernotex. This way, game packs does not have to provide them using the hardcoded textures/radiant/[shader]notex path (some games prefer other prefixes). It also allows GtkRadiant to not crash at startup when a wrong game path is set. It would also prevents radiant to fail where it tries to load these textures on very early stage when the whole VFS is not yet loaded, for example on pk3dir scenario. The notex and shadernotex textures come from Unvanquished's tex-common package and are distributed under public domain-like CC0 1.0 Universal license: https://creativecommons.org/publicdomain/zero/1.0/ See: https://github.com/UnvanquishedAssets/tex-common_src.dpkdir/blob/master/about/tex-common.txt --- install/base/textures/radiant/notex.png | Bin 0 -> 1919 bytes install/base/textures/radiant/shadernotex.png | Bin 0 -> 2029 bytes radiant/qe3.cpp | 4 ++++ 3 files changed, 4 insertions(+) create mode 100644 install/base/textures/radiant/notex.png create mode 100644 install/base/textures/radiant/shadernotex.png diff --git a/install/base/textures/radiant/notex.png b/install/base/textures/radiant/notex.png new file mode 100644 index 0000000000000000000000000000000000000000..d0185a00d9b52d52a8c84b0a693cc42f71d469ee GIT binary patch literal 1919 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 LNkvXXu0mjf!mGameFile == "hl.game" ) { // Hydra: we search the "gametools" path first so that we can provide editor