Merge commit 'b25e4389ba4d089fc94cc3860774c8510b843042' into master-merge

diff --cc radiant/brushmanip.cpp
Simple merge

diff --cc radiant/camwindow.cpp
Simple merge

diff --cc radiant/csg.cpp
index c034095df43d925e16d69461fb9be8f4bb3bf1e6,374384b35608c1dc5c84088c176727c1374ede37..59ea7e9c1b902cb40d64c368099f1287c13ad070
--- 1/radiant/csg.cpp
--- 2/radiant/csg.cpp
+++ b/radiant/csg.cpp
@@@ -598,17 -655,24 +642,20 @@@ void post( const scene::Path& path, sce
                        else
                        {
                                ++m_before;
 -                              for ( brush_vector_t::const_iterator i = out.begin(); i != out.end(); ++i )
 -                              {
 +                              for ( Brush *b : out ) {
                                        ++m_after;
 -                                      ( *i )->removeEmptyFaces();
 -                                      if ( !( *i )->empty() ) {
 +                                      b->removeEmptyFaces();
 +                                      if ( !b->empty() ) {
                                                NodeSmartReference node( ( new BrushNode() )->node() );
 -                                              Node_getBrush( node )->copy( *( *i ) );
 -                                              delete ( *i );
 +                                              Node_getBrush( node )->copy( *b );
                                                Node_getTraversable( path.parent() )->insert( node );
                                        }
 -                                      else{
 -                                              delete ( *i );
 -                                      }
 +                                      delete b;
                                }
                                Path_deleteTop( path );
+                               if( Node_getTraversable( path.parent() )->empty() ){
+                                       m_eraseParent = true;
+                               }
                        }
                }
        }

diff --cc radiant/mainframe.cpp
Simple merge

diff --cc radiant/surfacedialog.cpp
Simple merge