From: divverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Date: Tue, 12 May 2009 08:42:51 +0000 (+0000)
Subject: merge content and compile flags of all surfaces of a brush (experimental; fixes issue... 
X-Git-Tag: svn-r421~56
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c379aae1d41fde809019c5c97c95ddd038967ae7;p=xonotic%2Fnetradiant.git

merge content and compile flags of all surfaces of a brush (experimental; fixes issues with not working detail brushes; please check for regressions)


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 0173d834..b9862c51 100644
--- 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 */