]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
Merge commit '93a3d833ff57ef8304cb547dd1e3664b6b276ec4' into master-merge
authorThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 02:54:06 +0000 (04:54 +0200)
committerThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 02:54:06 +0000 (04:54 +0200)
1  2 
radiant/csg.cpp
radiant/gtkdlgs.cpp
radiant/mainframe.cpp

diff --cc radiant/csg.cpp
index be01396d0fa3b75898f09effce1f61f8866b8575,6ca051973c49ebdd731afefcdeb07842428cd5f3..5d20bf1c742b9753953e804201eee50a27109bc6
@@@ -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();
                                }
Simple merge
Simple merge