Smoke:

- Bugfix for not cleared smoke sim when doing alt-a and waiting for 2 sim cycles to complete

1 files changed, 14 insertions, 3 deletions

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 15c7d3b4678..97eb3aa866c 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -296,7 +296,7 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
 		return 1;
 	}
 
-	return 1;
+	return 2;
 }
 
 static void fill_scs_points(Object *ob, DerivedMesh *dm, SmokeCollSettings *scs)
@@ -1325,6 +1325,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 		int startframe, endframe, framenr;
 		float timescale;
 		int cache_result = 0, cache_result_wt = 0;
+		int did_init = 0;
 
 		framenr = scene->r.cfra;
 
@@ -1354,7 +1355,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 
 		// printf("startframe: %d, framenr: %d\n", startframe, framenr);
 
-		if(!smokeModifier_init(smd, ob, scene, dm))
+		if(!(did_init = smokeModifier_init(smd, ob, scene, dm)))
 		{
 			printf("bad smokeModifier_init\n");
 			return;
@@ -1411,8 +1412,18 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 				smoke_dissolve(sds->fluid, sds->diss_speed, sds->flags & MOD_SMOKE_DISSOLVE_LOG);
 			smoke_step(sds->fluid, smd->time, scene->r.frs_sec / scene->r.frs_sec_base);
 		}
+		else
+		{
+			/* Smoke did not load cache and was not reset but we're on startframe */
+			/* So now reinit the smoke since it was not done yet */
+			if(did_init == 2)
+			{
+				smokeModifier_reset(smd);
+				smokeModifier_init(smd, ob, scene, dm);
+			}
+		}
 
-		// create shadows before writing cache so we get nice shadows for sstartframe, too
+		// create shadows before writing cache so we get nice shadows for startframe, too
 		if(get_lamp(scene, light))
 			smoke_calc_transparency(sds->shadow, smoke_get_density(sds->fluid), sds->p0, sds->p1, sds->res, sds->dx, light, calc_voxel_transp, -7.0*sds->dx);