Merge commit '70b21eafbe10c90172922d8a7af4f06b9a3b242d' into master-merge

diff --git a/radiant/brush.h b/radiant/brush.h
index 3249cda0f2d994c4ff0f8aa3eaef260e5238db97..1e5a8de855359d1413fafe72f0e0295e3d6eafa2 100644 (file)
--- a/radiant/brush.h
+++ b/radiant/brush.h
@@ -2081,6 +2081,11 @@ void windingForClipPlane( Winding& winding, const Plane3& plane ) const {
                                continue;
                        }
 
+                       if( buffer[swap].points.empty() ){
+                               //globalErrorStream() << "windingForClipPlane: about to feed empty winding\n";
+                               break;
+                       }
+
                        buffer[!swap].clear();
 
 #if BRUSH_CONNECTIVITY_DEBUG

diff --git a/radiant/csg.cpp b/radiant/csg.cpp
index 59ea7e9c1b902cb40d64c368099f1287c13ad070..069c5c012e2c065966f8e003f97d62ae958c632b 100644 (file)
--- a/radiant/csg.cpp
+++ b/radiant/csg.cpp
@@ -421,8 +421,9 @@ void post( const scene::Path& path, scene::Instance& instance ) const {
                if ( brush != 0
                         && Instance_getSelectable( instance )->isSelected()
                         && path.size() > 1 ) {
+                       scene::Node& parent = path.parent();
                        Path_deleteTop( path );
-                       if( Node_getTraversable( path.parent() )->empty() ){
+                       if( Node_getTraversable( parent )->empty() ){
                                m_eraseParent = true;
                                //globalOutputStream() << "Empty node?!.\n";
                        }

diff --git a/radiant/selection.cpp b/radiant/selection.cpp
index 18334c2090369753e01f1b5f9132e587424f3db8..7ddc879932ed7465f8aab97e1aa1210d63b7f65c 100644 (file)
--- a/radiant/selection.cpp
+++ b/radiant/selection.cpp
@@ -3404,7 +3404,7 @@ void RadiantSelectionSystem::ConstructPivot() const {
                        m_object_pivot = bounds.origin;
                }
 
-               vector3_snap( m_object_pivot, GetSnapGridSize() );
+               //vector3_snap( m_object_pivot, GetSnapGridSize() );
                m_pivot2world = matrix4_translation_for_vec3( m_object_pivot );
 
                switch ( m_manipulator_mode )