Q3map2:

	* do not delete q3map2_*.shader on minimap generation

Radiant:

misc...
	* fix: crash in CSG::BrushDeleteSelected
	* fix: crash in Brush::windingForClipPlane
	* disabled snapping of transform/pivot origin

diff --git a/radiant/brush.h b/radiant/brush.h
index 93b3f6367449bdd47d6bbe00a4e569557224184d..611ad11587543654ca8be86693162a9590bba396 100644 (file)
--- a/radiant/brush.h
+++ b/radiant/brush.h
@@ -2014,6 +2014,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 1b824b6abedc8f5e0e1199fc841803bb9cd55271..753c5077e5998abaf9dd8fce916724acb322e405 100644 (file)
--- a/radiant/csg.cpp
+++ b/radiant/csg.cpp
@@ -419,8 +419,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 7f4cdf7a1d0eebadde55ee7fec4de2c29a3e54ad..ff4c6ee32fab33129828cde4ea9f0542aef36e2f 100644 (file)
--- a/radiant/selection.cpp
+++ b/radiant/selection.cpp
@@ -3400,7 +3400,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 )

diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c
index 2e97c89d0c5cb20eaeea7c4a13242f0757c2dd96..0240bb830593b63982553957af0140c742209dc4 100644 (file)
--- a/tools/quake3/q3map2/main.c
+++ b/tools/quake3/q3map2/main.c
@@ -546,7 +546,7 @@ int MiniMapBSPMain( int argc, char **argv ){
        StripExtension( source );
        DefaultExtension( source, ".bsp" );
        Sys_Printf( "Loading %s\n", source );
-       BeginMapShaderFile( source );
+       //BeginMapShaderFile( source ); //do not delete q3map2_*.shader on minimap generation
        LoadShaderInfo();
        LoadBSPFile( source );