Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Particle mode: Fix memory leak with simple interpolated children

Browse Source
This commit is contained in:
Sergey Sharybin
2018-05-11 15:40:14 +02:00
parent b5beb660b3
commit 2f0aca4596
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/draw/intern/draw_cache_impl_particles.c
View File

@@ -277,7 +277,18 @@ static void particle_calculate_uvs(ParticleSystem *psys,
float (**r_parent_uvs)[2], float (**r_parent_uvs)[2],
float (**r_uv)[2]) float (**r_uv)[2])
{ {
if (psmd != NULL) { if (psmd == NULL) {
return;
}
if (is_simple) {
if (r_parent_uvs[parent_index] != NULL) {
*r_uv = r_parent_uvs[parent_index];
}
else {
*r_uv = MEM_callocN(sizeof(**r_uv) * num_uv_layers, "Particle UVs");
}
}
else {
*r_uv = MEM_callocN(sizeof(**r_uv) * num_uv_layers, "Particle UVs"); *r_uv = MEM_callocN(sizeof(**r_uv) * num_uv_layers, "Particle UVs");
} }
if (child_index == -1) { if (child_index == -1) {