svn merge ^/trunk/blender -r43676:43685

2012-01-24 22:44:48 +00:00
parent 3f31145d29 1aadbdedc7
commit 75a4832af3
7 changed files with 16 additions and 5 deletions
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -1127,6 +1127,9 @@ static int distribute_threads_init_data(ParticleThread *threads, Scene *scene, D
 			fprintf(stderr,"Particle distribution error: Nothing to emit from!\n");

 		if(dm != finaldm) dm->release(dm);
+
+		BLI_kdtree_free(tree);
+
 		return 0;
 	}