diff --git a/common/gal/opengl/opengl_gal.cpp b/common/gal/opengl/opengl_gal.cpp index 12f83d1dfa..919e1c1282 100644 --- a/common/gal/opengl/opengl_gal.cpp +++ b/common/gal/opengl/opengl_gal.cpp @@ -540,14 +540,6 @@ void OPENGL_GAL::EndDrawing() void OPENGL_GAL::rebuildVbo() { - /* FIXME should be done less naively, maybe sth like: - float *ptr = (float*)glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_WRITE_ARB); - if(ptr) - { - updateVertices(....); - glUnmapBufferARB(GL_ARRAY_BUFFER_ARB); // release pointer to mapping buffer - }*/ - #ifdef __WXDEBUG__ prof_counter totalTime; prof_start( &totalTime, false ); @@ -608,10 +600,6 @@ inline void OPENGL_GAL::drawLineQuad( const VECTOR2D& aStartPoint, const VECTOR2 { vector = transform * vector; } - else - { - glm::vec4 vector( perpendicularVector.x, perpendicularVector.y, 0.0, 0.0 ); - } // Line width is maintained by the vertex shader setShader( SHADER_LINE, vector.x, vector.y, lineWidth ); diff --git a/common/painter.cpp b/common/painter.cpp index 0541cb1e0e..dbc53ab965 100644 --- a/common/painter.cpp +++ b/common/painter.cpp @@ -34,7 +34,6 @@ RENDER_SETTINGS::RENDER_SETTINGS() { // Set the default initial values m_selectionBorderColor = COLOR4D( 1.0, 1.0, 1.0, 1.0 ); - m_netLabelColor = COLOR4D( 1.0, 1.0, 1.0, 0.7 ); m_highlightFactor = 0.5; m_selectFactor = 0.5; diff --git a/include/painter.h b/include/painter.h index f4ac232821..184993019f 100644 --- a/include/painter.h +++ b/include/painter.h @@ -128,7 +128,6 @@ protected: float m_highlightFactor; /// Factor used for computing hightlight color COLOR4D m_selectionBorderColor; /// Color of selection box border - COLOR4D m_netLabelColor; /// Color of net labels float m_selectFactor; /// Specifies how color of selected items is changed float m_layerOpacity; /// Determines opacity of all layers, so every can be seen