[Bf-blender-cvs] [6cc93dc] temp_viewport_fx_merge: Fix an invalid operation

[Antony Riakiotakis]

Commit: 6cc93dcc5ead1f347a8e2c38f8b5aed5d2ade1a3
Author: Antony Riakiotakis
Date:   Wed Apr 1 14:40:13 2015 +0200
Branches: temp_viewport_fx_merge
https://developer.blender.org/rB6cc93dcc5ead1f347a8e2c38f8b5aed5d2ade1a3

Fix an invalid operation

===================================================================

M	source/blender/gpu/intern/gpu_immediate.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_immediate.c b/source/blender/gpu/intern/gpu_immediate.c
index b32ee01..ef1cfaf 100644
--- a/source/blender/gpu/intern/gpu_immediate.c
+++ b/source/blender/gpu/intern/gpu_immediate.c
@@ -116,10 +116,9 @@ static void alloc_stream_vbuffer(GPUVertexStream *stream, size_t newsize)
 	if (newsize > stream->size) {
 		GPUVertexBufferStream *va_stream = (GPUVertexBufferStream *)stream;
 
-		if (va_stream->vbo)
-			glBindBuffer(stream->type, va_stream->vbo);
-		else
+		if (!va_stream->vbo)
 			glGenBuffers(1, &va_stream->vbo);
+		glBindBuffer(stream->type, va_stream->vbo);
 		glBufferData(stream->type, newsize, NULL, GL_STREAM_DRAW);
 		stream->size = newsize;
 	}
@@ -695,6 +694,7 @@ void gpu_end_buffer_gl(void)
 		}
 
 		unsetup();
+		stream->unbind(stream);
 		GPU_ASSERT_NO_GL_ERRORS("gpu_end_buffer_gl end");
 	}
 }