[Bf-blender-cvs] [1df4279] master: Try to remap buffer before rejecting.

[Antony Riakiotakis]

Commit: 1df42798d46d031c7666a75b47faa0d20fc965ef
Author: Antony Riakiotakis
Date:   Tue Jul 21 16:40:58 2015 +0200
Branches: master
https://developer.blender.org/rB1df42798d46d031c7666a75b47faa0d20fc965ef

Try to remap buffer before rejecting.

I suspect code here can be cleaned up but for now try this.
Alternatively we can check for errors around buffer allocation
but this needs bigger changes.

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

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

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

diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index 4691659..346e229 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -540,7 +540,7 @@ static GPUBuffer *gpu_buffer_setup(DerivedMesh *dm, GPUDrawObject *object,
 
 				/* allocation still failed; fall back
 				 * to legacy mode */
-				if (!buffer) {
+				if (!(buffer && (varray = glMapBufferARB(target, GL_WRITE_ONLY_ARB)))) {
 					use_VBOs = false;
 					success = true;
 				}