Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / radiant / texwindow.cpp

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 7d9a44d7fd5f1074d01b88beedddf2b6f9d02e15..22559b6adc6a2ac8ec5fec3fd7516465bd202fda 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -151,9 +151,6 @@ void TextureGroups_addShader( TextureGroups& groups, const char* shaderName ){
                if ( isNotex( shaderName ) ) {
                        return;
                }
-               if ( isNotex( texture ) ) {
-                       return;
-               }
        }
 
        if ( texture != shaderName ) {
@@ -550,9 +547,6 @@ bool Texture_IsShown( IShader* shader, bool show_shaders, bool show_textures, bo
                if ( isNotex( shader->getName() ) ) {
                        return false;
                }
-               if ( isNotex( shader->getTexture()->name ) ) {
-                       return false;
-               }
        }
 
        if ( g_TextureBrowser_currentDirectory == "Untagged" ) {
@@ -1904,6 +1898,8 @@ ui::MenuItem TextureBrowser_constructViewMenu( ui::Menu menu ){
        }
 
        create_check_menu_item_with_mnemonic( menu, "Hide _Unused", "ShowInUse" );
+       create_menu_item_with_mnemonic( menu, "Show All", "ShowAllTextures" );
+
        if ( string_empty( g_pGameDescription->getKeyValue( "show_wads" ) ) ) {
                create_check_menu_item_with_mnemonic( menu, "Hide Image Missing", "FilterMissing" );
        }