Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-01-14 15:17:24 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-01-14 15:17:24 +0400
commitca2a14491e145de400a0a0f2424ba77b281d0372 (patch)
tree34550dc039ad1a641c4be254ae1389df249a1055 /source/blender/blenkernel/intern/smoke.c
parente7d18eb7bd706624183dd6d65f3e55faa5fb1956 (diff)
Fix T38196: Crash with smoke simulation
Issue was caused by KD tree being allocated with the wrong size.
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
-rw-r--r--source/blender/blenkernel/intern/smoke.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 9b254107e5d..e83323ea7a3 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)) {