quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Q3map2:

Browse Source 
* 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
This commit is contained in:
Garux 2017-08-02 09:04:00 +03:00
parent e8686a54bf
commit fa294e4215
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
radiant/brush.h
View File

@ -2014,6 +2014,11 @@ void windingForClipPlane( Winding& winding, const Plane3& plane ) const {
continue; continue;
} }
if( buffer[swap].points.empty() ){
//globalErrorStream() << "windingForClipPlane: about to feed empty winding\n";
break;
}
buffer[!swap].clear(); buffer[!swap].clear();
#if BRUSH_CONNECTIVITY_DEBUG #if BRUSH_CONNECTIVITY_DEBUG

3
radiant/csg.cpp
View File

@ -419,8 +419,9 @@ void post( const scene::Path& path, scene::Instance& instance ) const {
if ( brush != 0 if ( brush != 0
&& Instance_getSelectable( instance )->isSelected() && Instance_getSelectable( instance )->isSelected()
&& path.size() > 1 ) { && path.size() > 1 ) {
scene::Node& parent = path.parent();
Path_deleteTop( path ); Path_deleteTop( path );
if( Node_getTraversable( path.parent() )->empty() ){ if( Node_getTraversable( parent )->empty() ){
m_eraseParent = true; m_eraseParent = true;
//globalOutputStream() << "Empty node?!.\n"; //globalOutputStream() << "Empty node?!.\n";
} }

2
radiant/selection.cpp
View File

@ -3400,7 +3400,7 @@ void RadiantSelectionSystem::ConstructPivot() const {
m_object_pivot = bounds.origin; 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 ); m_pivot2world = matrix4_translation_for_vec3( m_object_pivot );
switch ( m_manipulator_mode ) switch ( m_manipulator_mode )

2
tools/quake3/q3map2/main.c
View File

@ -546,7 +546,7 @@ int MiniMapBSPMain( int argc, char **argv ){
StripExtension( source ); StripExtension( source );
DefaultExtension( source, ".bsp" ); DefaultExtension( source, ".bsp" );
Sys_Printf( "Loading %s\n", source ); Sys_Printf( "Loading %s\n", source );
BeginMapShaderFile( source ); //BeginMapShaderFile( source ); //do not delete q3map2_*.shader on minimap generation
LoadShaderInfo(); LoadShaderInfo();
LoadBSPFile( source ); LoadBSPFile( source );