[Bf-blender-cvs] [ca2a144] master: Fix T38196: Crash with smoke simulation

Sergey Sharybin noreply at git.blender.org
Tue Jan 14 12:18:44 CET 2014


Commit: ca2a14491e145de400a0a0f2424ba77b281d0372
Author: Sergey Sharybin
Date:   Tue Jan 14 17:17:24 2014 +0600
https://developer.blender.org/rBca2a14491e145de400a0a0f2424ba77b281d0372

Fix T38196: Crash with smoke simulation

Issue was caused by KD tree being allocated with the wrong size.

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

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

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

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 9b25410..e83323e 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -1250,7 +1250,7 @@ static void emit_from_particles(Object *flow_ob, SmokeDomainSettings *sds, Smoke
 
 		/* setup particle radius emission if enabled */
 		if (sfs->flags & MOD_SMOKE_FLOW_USE_PART_SIZE) {
-			tree = BLI_kdtree_new(psys->totpart);
+			tree = BLI_kdtree_new(psys->totpart + psys->totchild);
 
 			/* check need for high resolution map */
 			if ((sds->flags & MOD_SMOKE_HIGHRES) && (sds->highres_sampling == SM_HRES_FULLSAMPLE)) {




More information about the Bf-blender-cvs mailing list