Commit 4b6c6a5c authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Merged 'testing'

parents c33564c6 75bb8470

CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ add_dependencies( 3d-viewer boost ) 
add_dependencies( pcad2kicadpcb boost )

add_dependencies( polygon boost )

add_dependencies( pl_editor boost )

add_dependencies( pnsrouter boost )





#############

common/gal/opengl/opengl_compositor.cpp

+13 −1
Original line number Diff line number Diff line
@@ -95,8 +95,13 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer() 
{

    wxASSERT( m_initialized );



    if( m_buffers.size() >= m_maxBuffers )

    //if( usedBuffers() >= m_maxBuffers )

    {

        wxLogError( wxT( "Cannot create more framebuffers. OpenGL rendering backend requires at"

                         "least 3 framebuffers. You may try to update/change "

                         "your graphic drivers." ) );

        return 0; // Unfortunately we have no more free buffers left

    }



    // GL_COLOR_ATTACHMENTn are consecutive integers

    GLuint attachmentPoint = GL_COLOR_ATTACHMENT0 + usedBuffers();
@@ -165,6 +170,8 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer() 
            wxLogFatalError( wxT( "Cannot create the framebuffer." ) );

            break;

        }



        return 0;

    }



    ClearBuffer();
@@ -218,6 +225,11 @@ void OPENGL_COMPOSITOR::ClearBuffer() 
void OPENGL_COMPOSITOR::DrawBuffer( unsigned int aBufferHandle )

{

    wxASSERT( m_initialized );

    if( aBufferHandle == 0 || aBufferHandle > usedBuffers() )

    {

        wxLogError( wxT( "Wrong framebuffer handle" ) );

        return;

    }



    // Switch to the main framebuffer and blit the scene

    glBindFramebuffer( GL_FRAMEBUFFER, DIRECT_RENDERING );

pcbnew/router/router_tool.cpp

+8 −8
Original line number Diff line number Diff line
@@ -55,14 +55,14 @@ ROUTER_TOOL::ROUTER_TOOL() : 
    m_menu = new CONTEXT_MENU;



    m_menu->SetTitle( wxT( "Interactive router" ) );    // fixme: not implemented yet. Sorry.

    m_menu->Add( wxT( "Cancel" ), 0 );

    m_menu->Add( wxT( "New track" ), 1 );

    m_menu->Add( wxT( "End track" ), 2 );

    m_menu->Add( wxT( "Auto-end track" ), 3 );

    m_menu->Add( wxT( "Place via" ), 4 );

    m_menu->Add( wxT( "Switch posture" ), 5 );



    m_menu->Add( wxT( "Routing options..." ), 6 );

    m_menu->Add( wxT( "Cancel" ), 1 );

    m_menu->Add( wxT( "New track" ), 2 );

    m_menu->Add( wxT( "End track" ), 3 );

    m_menu->Add( wxT( "Auto-end track" ), 4 );

    m_menu->Add( wxT( "Place via" ), 5 );

    m_menu->Add( wxT( "Switch posture" ), 6 );



    m_menu->Add( wxT( "Routing options..." ), 7 );

}