From: Thomas Debesse <dev@illwieckz.net>
Date: Tue, 21 Jun 2022 02:54:06 +0000 (+0200)
Subject: Merge commit '93a3d833ff57ef8304cb547dd1e3664b6b276ec4' into master-merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=33c2ac317fb28958134c26a247c239cb4961e49b;p=xonotic%2Fnetradiant.git

Merge commit '93a3d833ff57ef8304cb547dd1e3664b6b276ec4' into master-merge
---

33c2ac317fb28958134c26a247c239cb4961e49b
diff --cc radiant/csg.cpp
index be01396d,6ca05197..5d20bf1c
--- a/radiant/csg.cpp
+++ b/radiant/csg.cpp
@@@ -141,9 -164,9 +164,9 @@@ void operator()( Face& face ) const 
  				face.planeChanged();
  
  				if( caulk ){
- 					Brush_forEachFace( *out.back(), CaulkFace( ExclusionAxis, mindot, maxdot ) );
+ 					Brush_forEachFace( *out.back(), CaulkFace( ExclusionAxis, mindot, maxdot, exclude_vec ) );
  				}
 -				Face* newFace = out.back()->addFace( face );
 +				std::shared_ptr<Face> newFace = out.back()->addFace( face );
  				if ( newFace != 0 ) {
  					newFace->flipWinding();
  				}