Merge branch 'master' into master-merge

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

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 7d9a44d7fd5f1074d01b88beedddf2b6f9d02e15..70ce3d29a767650a33a853e0cf8b3507519d85cf 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" ) {