[Bf-blender-cvs] [99ed95b] master: Fix really stupid issue reported by Campbell, code retry to render without VBOs would return prematurely and leak.

Antony Riakiotakis noreply at git.blender.org
Wed Mar 11 12:19:40 CET 2015


Commit: 99ed95bba297ee13e04571b066d17c53503ffe13
Author: Antony Riakiotakis
Date:   Wed Mar 11 12:18:44 2015 +0100
Branches: master
https://developer.blender.org/rB99ed95bba297ee13e04571b066d17c53503ffe13

Fix really stupid issue reported by Campbell, code retry to render
without VBOs would return prematurely and leak.

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

M	source/blender/blenkernel/intern/cdderivedmesh.c

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

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 447249c..6b7855b 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1085,9 +1085,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm,
 						elementsize = GPU_attrib_element_size(datatypes, numdata);
 						buffer = GPU_buffer_alloc(elementsize * dm->drawObject->tot_triangle_point, false);
 						if (buffer == NULL) {
-							GPU_buffer_unbind();
 							buffer = GPU_buffer_alloc(elementsize * dm->drawObject->tot_triangle_point, true);
-							return;
 						}
 						varray = GPU_buffer_lock_stream(buffer);
 						if (varray == NULL) {




More information about the Bf-blender-cvs mailing list