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

also merge clipper points on CSGWrapMerge command

Browse Source
This commit is contained in:
Garux 2018-11-15 01:02:37 +03:00
parent a88202f6c1
commit 1ae93ef20c
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
radiant/clippertool.cpp
View File

@ -72,6 +72,10 @@ void Clipper_setPlanePoints( const ClipperPoints& points ){
Clipper_update();
}
const ClipperPoints& Clipper_getPlanePoints(){
return g_clipper_points;
}
#include "gtkutil/idledraw.h"
void Clipper_BoundsChanged(){
if ( Clipper_ok_plane() )

1
radiant/clippertool.h
View File

@ -48,6 +48,7 @@ public:
void Clipper_setPlanePoints( const ClipperPoints& points );
const ClipperPoints& Clipper_getPlanePoints();
void Clipper_Construct();
void Clipper_Destroy();
void Clipper_modeChanged( bool isClipper );

2
radiant/csg.cpp
View File

@ -1225,7 +1225,7 @@ void CSG_WrapMerge( const ClipperPoints& clipperPoints ){
void CSG_WrapMerge(){
UndoableCommand undo( "brushWrapMerge" );
CSG_WrapMerge( ClipperPoints() );
CSG_WrapMerge( Clipper_getPlanePoints() );
}

13
radiant/selection.cpp
View File

@ -4508,8 +4508,10 @@ EComponentMode ComponentMode() const {
return m_componentmode;
}
void SetManipulatorMode( EManipulatorMode mode ){
if( ( mode == eClip ) != ( ManipulatorMode() == eClip ) ){
Clipper_modeChanged( mode == eClip );
if( ( mode == eClip ) || ( ManipulatorMode() == eClip ) ){
m_clip_manipulator.reset();
if( ( mode == eClip ) != ( ManipulatorMode() == eClip ) )
Clipper_modeChanged( mode == eClip );
}
m_pivotIsCustom = false;
@ -4521,12 +4523,7 @@ void SetManipulatorMode( EManipulatorMode mode ){
case eScale: m_manipulator = &m_scale_manipulator; break;
case eSkew: m_manipulator = &m_skew_manipulator; break;
case eDrag: m_manipulator = &m_drag_manipulator; break;
case eClip:
{
m_manipulator = &m_clip_manipulator;
m_clip_manipulator.reset();
break;
}
case eClip: m_manipulator = &m_clip_manipulator; break;
}
pivotChanged();
}