diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-09-28 09:06:02 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-09-28 09:06:02 +0400 |
| commit | 71958f00527a318e2e31abeb6b6fe6bc990351ce (patch) | |
| tree | a86c9bcb3465653823aa2ebcd09ad6fada2ef12e /source/blender/blenkernel/intern/smoke.c | |
| parent | 25509ba8afabddb4ec9be9b4ccb7b5cf89c9d851 (diff) | |
Fix [#36827] 2.69 bug with smoke domain, particle emitter and a force field causes a crash
fuel array might be null!
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 2e2fb1e18f8..fb0e22abf2a 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -2409,7 +2409,7 @@ static void update_effectors(Scene *scene, Object *ob, SmokeDomainSettings *sds, float voxelCenter[3] = {0, 0, 0}, vel[3] = {0, 0, 0}, retvel[3] = {0, 0, 0}; unsigned int index = smoke_get_index(x, sds->res[0], y, sds->res[1], z); - if ((MAX2(density[index], fuel[index]) < FLT_EPSILON) || obstacle[index]) + if (((fuel ? MAX2(density[index], fuel[index]) : density[index]) < FLT_EPSILON) || obstacle[index]) continue; vel[0] = velocity_x[index]; |