diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-02-14 15:54:42 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-02-14 15:58:43 +0400 |
| commit | 30c9fe19a31f6f92be4de2abacb9fd96179a9a04 (patch) | |
| tree | 98334e36b5bc88b731eafa463055bad8768d46d3 /source/blender/blenkernel/intern/smoke.c | |
| parent | 32b45cb4a7adeae637e02c3a8da87e28844e587f (diff) | |
Fix for crash caused by effectors doing precalculation //during// DAG
updates.
This file crashes on loading with NULL pointer access to curve_cache:
{F77132}
The pdInitEffectors function was amalgamating the simple
collection of effector objects with an automatic precalculation for
curve guides and the like. This precalculation requires object data
that may not be available until the DAG has finished.
Since for DAG dependencies only the list of effectors is required,
added an argument to disable precalculation when collecting effectors.
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 6aaf2ee4df0..61d9ea99c2f 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -2363,7 +2363,7 @@ static void update_effectors(Scene *scene, Object *ob, SmokeDomainSettings *sds, ListBase *effectors; /* make sure smoke flow influence is 0.0f */ sds->effector_weights->weight[PFIELD_SMOKEFLOW] = 0.0f; - effectors = pdInitEffectors(scene, ob, NULL, sds->effector_weights); + effectors = pdInitEffectors(scene, ob, NULL, sds->effector_weights, true); if (effectors) { |