[Bf-blender-cvs] [7490b24241f] blender2.8: Draw Manager: Fix instancing. Again.

Clément Foucault noreply at git.blender.org
Thu May 18 16:05:09 CEST 2017


Commit: 7490b24241ff3c508de37581174d38a468158e1f
Author: Clément Foucault
Date:   Thu May 18 16:04:30 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB7490b24241ff3c508de37581174d38a468158e1f

Draw Manager: Fix instancing. Again.

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

M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 7b953be1009..72257b00c9e 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -810,7 +810,9 @@ void DRW_shgroup_free(struct DRWShadingGroup *shgroup)
 	BLI_freelistN(&shgroup->interface->uniforms);
 	BLI_freelistN(&shgroup->interface->attribs);
 
-	if (shgroup->interface->instance_vbo) {
+	if (shgroup->interface->instance_vbo &&
+		(shgroup->interface->instance_batch == 0))
+	{
 		glDeleteBuffers(1, &shgroup->interface->instance_vbo);
 	}




More information about the Bf-blender-cvs mailing list