haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a duplicate definition of the TOOL_DISPATCHER. 

Fixes https://gitlab.com/kicad/code/kicad/issues/4110
This commit is contained in:
Jeff Young 2020-03-28 17:52:26 +00:00
parent 88c4254bb5
commit 42a876d963
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3d-viewer/3d_viewer/eda_3d_viewer.cpp
View File

@ -90,8 +90,7 @@ EDA_3D_VIEWER::EDA_3D_VIEWER( KIWAY *aKiway, PCB_BASE_FRAME *aParent, const wxSt
m_mainToolBar( nullptr ), m_mainToolBar( nullptr ),
m_canvas( nullptr ), m_canvas( nullptr ),
m_currentCamera( m_trackBallCamera ), m_currentCamera( m_trackBallCamera ),
m_trackBallCamera( RANGE_SCALE_3D ), m_trackBallCamera( RANGE_SCALE_3D )
m_toolDispatcher( nullptr )
{ {
wxLogTrace( m_logTrace, "EDA_3D_VIEWER::EDA_3D_VIEWER %s", aTitle ); wxLogTrace( m_logTrace, "EDA_3D_VIEWER::EDA_3D_VIEWER %s", aTitle );

2
3d-viewer/3d_viewer/eda_3d_viewer.h
View File

@ -212,8 +212,6 @@ private:
CCAMERA& m_currentCamera; CCAMERA& m_currentCamera;
CTRACK_BALL m_trackBallCamera; CTRACK_BALL m_trackBallCamera;
TOOL_DISPATCHER* m_toolDispatcher;
bool m_disable_ray_tracing; bool m_disable_ray_tracing;
/** /**

2
include/eda_draw_frame.h
View File

@ -93,8 +93,6 @@ protected:
// to screens // to screens
bool m_PolarCoords; // For those frames that support polar coordinates bool m_PolarCoords; // For those frames that support polar coordinates
TOOL_DISPATCHER* m_toolDispatcher;
bool m_showBorderAndTitleBlock; // Show the worksheet (border and title block). bool m_showBorderAndTitleBlock; // Show the worksheet (border and title block).
long m_firstRunDialogSetting; // Show first run dialog on startup long m_firstRunDialogSetting; // Show first run dialog on startup