X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=81a2acd5182a413777c39f0ebe944fe617b79b22;hb=d23880571efc16dff1cfeeb92f35fe54c8f64c3d;hp=0d4fd919cffa8daa210c416414024357a07d9d59;hpb=99b656a7c44859a038156b82365122a5e336b1e8;p=libs%2Fgl.git diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp index 0d4fd919..81a2acd5 100644 --- a/source/vertexarray.cpp +++ b/source/vertexarray.cpp @@ -118,7 +118,8 @@ void VertexArray::apply() const set_array(GL_TEXTURE_COORD_ARRAY, found&4, 4); set_array(GL_COLOR_ARRAY, found&8, 8); - VertexBuffer::unbind(); + if(vbuf) + VertexBuffer::unbind(); } /** @@ -127,7 +128,10 @@ Updates the VertexArray data to the VertexBuffer tied to the array, if any. void VertexArray::update_data() { if(vbuf) + { vbuf->data(data.size()*sizeof(float), &data[0]); + VertexBuffer::unbind(); + } } void VertexArray::set_array(unsigned array, unsigned bit, unsigned mask) const