[Bf-blender-cvs] [a651697] soc-2014-fluid: frame counting for simulation correct

[Roman Pogribnyi]

Commit: a651697d786c37936b7f8c19f5474bc57f23f40e
Author: Roman Pogribnyi
Date:   Sun Aug 17 22:26:26 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rBa651697d786c37936b7f8c19f5474bc57f23f40e

frame counting for simulation correct

===================================================================

M	source/blender/blenkernel/intern/smoke.c

===================================================================

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 8ad4318..d5275eb 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2804,19 +2804,17 @@ static void smokeModifier_process(SmokeModifierData *smd, Scene *scene, Object *
 			const char *density_name_format = "./den%04d.uni";
 			const char *wavelets_name_format = "./densityXL_%04d.uni";
 			char buff[100];
-			if(smd->domain->manta_start_frame > scene->r.cfra)
-				return;
-			sprintf(buff, density_name_format, scene->r.cfra - smd->domain->manta_start_frame);
+//			if(smd->domain->manta_start_frame > scene->r.cfra)
+//				return;
+			sprintf(buff, density_name_format, scene->r.cfra);
 			bool read_density = smoke_mantaflow_read(smd->domain, buff, 0);
 			bool read_wavelets = 1;
 			if (smd->domain->flags & MOD_SMOKE_HIGHRES)
 			{
 				/*highdres*/
-				sprintf(buff, wavelets_name_format, scene->r.cfra - smd->domain->manta_start_frame);
+				sprintf(buff, wavelets_name_format, scene->r.cfra);
 				read_wavelets = smoke_mantaflow_read(smd->domain, buff, 1);	
 			}
-			//			smoke_calc_transparency(sds, scene);
-			//			return;
 		}else{
 			if (framenr != startframe)
 			{