Smoke:

- Fix typo in tooltip
- Add timeframe independand timesteps

4 files changed, 8 insertions, 5 deletions

diff --git a/intern/smoke/extern/smoke_API.h b/intern/smoke/extern/smoke_API.h
index d1012eef76e..b340c914519 100644
--- a/intern/smoke/extern/smoke_API.h
+++ b/intern/smoke/extern/smoke_API.h
@@ -42,7 +42,7 @@ struct FLUID_3D *smoke_init(int *res, float *p0);
 void smoke_free(struct FLUID_3D *fluid);
 
 void smoke_initBlenderRNA(struct FLUID_3D *fluid, float *alpha, float *beta, float *dt_factor, float *vorticity, int *border_colli);
-void smoke_step(struct FLUID_3D *fluid, size_t framenr);
+void smoke_step(struct FLUID_3D *fluid, size_t framenr, float fps);
 
 float *smoke_get_density(struct FLUID_3D *fluid);
 float *smoke_get_heat(struct FLUID_3D *fluid);
diff --git a/intern/smoke/intern/smoke_API.cpp b/intern/smoke/intern/smoke_API.cpp
index 23c12c17014..168395f370d 100644
--- a/intern/smoke/intern/smoke_API.cpp
+++ b/intern/smoke/intern/smoke_API.cpp
@@ -75,13 +75,13 @@ extern "C" size_t smoke_get_index2d(int x, int max_x, int y /*, int max_y, int z
 	return x + y * max_x;
 }
 
-extern "C" void smoke_step(FLUID_3D *fluid, size_t framenr)
+extern "C" void smoke_step(FLUID_3D *fluid, size_t framenr, float fps)
 {
 	/* stability values copied from wturbulence.cpp */
 	const int maxSubSteps = 25;
 	const float maxVel = 0.5f; /* TODO: maybe 0.5 is still too high, please confirm! -dg */
 
-	const float dt = DT_DEFAULT;
+	float dt = DT_DEFAULT;
 	float maxVelMag = 0.0f;
 	int totalSubsteps;
 	int substep = 0;
@@ -97,6 +97,9 @@ extern "C" void smoke_step(FLUID_3D *fluid, size_t framenr)
 			maxVelMag = vtemp;
 	}
 
+	/* adapt timestep for different framerates, dt = 0.1 is at 25fps */
+	dt *= (25.0f / fps);
+
 	maxVelMag = sqrt(maxVelMag) * dt * (*(fluid->_dtFactor));
 	totalSubsteps = (int)((maxVelMag / maxVel) + 1.0f); /* always round up */
 	totalSubsteps = (totalSubsteps < 1) ? 1 : totalSubsteps;
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 193512b11dc..b106c557b92 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -1413,7 +1413,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 		{
 			if(sds->flags & MOD_SMOKE_DISSOLVE)
 				smoke_dissolve(sds->fluid, sds->diss_speed, sds->flags & MOD_SMOKE_DISSOLVE_LOG);
-			smoke_step(sds->fluid, smd->time);
+			smoke_step(sds->fluid, smd->time, scene->r.frs_sec / scene->r.frs_sec_base);
 		}
 
 		// create shadows before writing cache so we get nice shadows for sstartframe, too
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 56049ea15ce..cd2297cc273 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -245,7 +245,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "smoke_domain_colli", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "border_collisions");
 	RNA_def_property_enum_items(prop, smoke_domain_colli_items);
-	RNA_def_property_ui_text(prop, "Cache Compression", "Compression method to be used");
+	RNA_def_property_ui_text(prop, "Border Collisions", "Selects which domain border will be treated as collision object.");
 	RNA_def_property_update(prop, 0, NULL);
 
 	prop= RNA_def_property(srna, "effector_weights", PROP_POINTER, PROP_NONE);