[Bf-blender-cvs] [a3773dcc4fa] blender2.8: Fix memleak with GPUhairs.

Clément Foucault noreply at git.blender.org
Thu Jun 7 18:43:54 CEST 2018


Commit: a3773dcc4fa0ab5dd268382019f5614948a623b9
Author: Clément Foucault
Date:   Thu Jun 7 18:43:10 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa3773dcc4fa0ab5dd268382019f5614948a623b9

Fix memleak with GPUhairs.

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

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

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

diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c
index 46469136243..1eea400b63d 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -181,7 +181,8 @@ static void particle_batch_cache_clear_hair(ParticleHairCache *hair_cache)
 	for (int i = 0; i < MAX_HAIR_SUBDIV; ++i) {
 		GWN_VERTBUF_DISCARD_SAFE(hair_cache->final[i].proc_buf);
 		DRW_TEXTURE_FREE_SAFE(hair_cache->final[i].proc_tex);
-		for (int j = 0; j < MAX_THICKRES - 1; ++j) {
+		for (int j = 0; j < MAX_THICKRES; ++j) {
+			printf("Free cache->final[%d].proc_hairs[%d]\n", i, j);
 			GWN_BATCH_DISCARD_SAFE(hair_cache->final[i].proc_hairs[j]);
 		}
 	}
@@ -975,6 +976,7 @@ static void particle_batch_cache_ensure_procedural_indices(
 		}
 	}
 
+	printf("Alloc cache->final[%d].proc_hairs[%d]\n", subdiv, thickness_res - 1);
 	cache->final[subdiv].proc_hairs[thickness_res - 1] = GWN_batch_create_ex(
 	        prim_type,
 	        vbo,



More information about the Bf-blender-cvs mailing list