Commit 06341c6f authored by Christopher Tenter's avatar Christopher Tenter
Browse files

check for uninitialized vbo before picking

parent 5a4e6e2b
Pipeline #2133 passed with stage
in 79 minutes and 54 seconds
...@@ -460,10 +460,14 @@ pick_vertices( GLState& _state ) ...@@ -460,10 +460,14 @@ pick_vertices( GLState& _state )
if (pickShader && pickShader->isLinked()) if (pickShader && pickShader->isLinked())
{ {
// Update the vbo only if required.
if (updateVBO_)
updateVBO();
// Bind the vertex array // Bind the vertex array
ACG::GLState::bindBuffer(GL_ARRAY_BUFFER_ARB, vbo_); ACG::GLState::bindBuffer(GL_ARRAY_BUFFER_ARB, vbo_);
unsigned int pickOffsetIndex = _state.pick_current_index(); int pickOffsetIndex = int(_state.pick_current_index());
vertexDecl_.activateShaderPipeline(pickShader); vertexDecl_.activateShaderPipeline(pickShader);
...@@ -568,6 +572,10 @@ pick_edges( GLState& _state, unsigned int _offset) ...@@ -568,6 +572,10 @@ pick_edges( GLState& _state, unsigned int _offset)
if (pickShader && pickShader->isLinked()) if (pickShader && pickShader->isLinked())
{ {
// Update the vbo only if required.
if (updateVBO_)
updateVBO();
// Bind the vertex array // Bind the vertex array
ACG::GLState::bindBuffer(GL_ARRAY_BUFFER_ARB, vbo_); ACG::GLState::bindBuffer(GL_ARRAY_BUFFER_ARB, vbo_);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment