kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix [#36827] 2.69 bug with smoke domain, particle emitter and a force field causes a crash

Browse Source 
fuel array might be null!
This commit is contained in:
Bastien Montagne 2013-09-28 05:06:02 +00:00
parent 25509ba8af
commit 71958f0052
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/smoke.c
View File

@ -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];