merge content and compile flags of all surfaces of a brush (experimental; fixes issue...

git-svn-id: svn://svn.icculus.org/netradiant/trunk@364 61c419a2-8eb2-4b30-bcec-8cead039b335

diff --git a/tools/quake3/q3map2/map.c b/tools/quake3/q3map2/map.c
index 0173d834ff1c9d0c19e41962a24d1076d0fe27f8..b9862c51d4fe61a354b331a71a12bdcabc7204a0 100644 (file)
--- a/tools/quake3/q3map2/map.c
+++ b/tools/quake3/q3map2/map.c
@@ -345,6 +345,9 @@ void SetBrushContents( brush_t *b )
                        continue;
                if( s->contentFlags != contentFlags || s->compileFlags != compileFlags )
                        mixed = qtrue;
+
+               contentFlags |= s->contentFlags;
+               compileFlags |= s->compileFlags;
        }
        
        /* ydnar: getting rid of this stupid warning */