Fix cherry-pick for v8
This commit is contained in:
parent
d552ce00aa
commit
a8871fdda4
|
@ -1035,8 +1035,12 @@ OPT_TOOL_EVENT EE_SELECTION_TOOL::autostartEvent( TOOL_EVENT* aEvent, EE_GRID_HE
|
|||
wxCHECK( pin, OPT_TOOL_EVENT() );
|
||||
|
||||
if( !pin->IsVisible()
|
||||
<<<<<<< HEAD
|
||||
&& !( m_frame->eeconfig()->m_Appearance.show_hidden_pins
|
||||
|| m_frame->GetRenderSettings()->m_ShowHiddenLibPins ) )
|
||||
=======
|
||||
&& !( m_frame->eeconfig()->m_Appearance.show_hidden_pins ) )
|
||||
>>>>>>> 763cabad43 (Fix cherry-pick for v8)
|
||||
{
|
||||
return OPT_TOOL_EVENT();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue