[Bf-blender-cvs] [ddeb4c5f58a] fluid-mantaflow: fix for wrong framenr argument in step function

[Sebastián Barschkis]

Commit: ddeb4c5f58a71b70c521296c42bb704709c4cbe8
Author: Sebastián Barschkis
Date:   Fri Mar 24 15:51:20 2017 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBddeb4c5f58a71b70c521296c42bb704709c4cbe8

fix for wrong framenr argument in step function

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

M	intern/mantaflow/extern/manta_fluid_API.h
M	intern/mantaflow/intern/FLUID.cpp
M	intern/mantaflow/intern/manta_fluid_API.cpp
M	intern/mantaflow/intern/strings/liquid_script.h
M	intern/mantaflow/intern/strings/smoke_script.h
M	source/blender/blenkernel/intern/smoke.c

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

diff --git a/intern/mantaflow/extern/manta_fluid_API.h b/intern/mantaflow/extern/manta_fluid_API.h
index 89cc73789c9..3caac020fd0 100644
--- a/intern/mantaflow/extern/manta_fluid_API.h
+++ b/intern/mantaflow/extern/manta_fluid_API.h
@@ -41,7 +41,7 @@ void smoke_free(struct FLUID *smoke);
 size_t smoke_get_index(int x, int max_x, int y, int max_y, int z /*, int max_z */);
 size_t smoke_get_index2d(int x, int max_x, int y /*, int max_y, int z, int max_z */);
 void smoke_manta_export(struct FLUID* smoke, struct SmokeModifierData *smd);
-void smoke_step(struct FLUID *smoke, int startFrame);
+void smoke_step(struct FLUID *smoke, int framenr);
 void smoke_dissolve(struct FLUID *smoke, int speed, int log);
 void smoke_dissolve_wavelet(struct FLUID *smoke, int speed, int log);
 void smoke_export(struct FLUID *smoke, float *dt, float *dx, float **dens, float **react, float **flame, float **fuel, float **heat, float **vx, float **vy, float **vz, float **r, float **g, float **b, int **obstacles);
diff --git a/intern/mantaflow/intern/FLUID.cpp b/intern/mantaflow/intern/FLUID.cpp
index 0263b4c980f..9d403c466b5 100644
--- a/intern/mantaflow/intern/FLUID.cpp
+++ b/intern/mantaflow/intern/FLUID.cpp
@@ -360,14 +360,14 @@ void FLUID::initLiquidHigh(SmokeModifierData *smd)
 	mUsingHighRes = true;
 }
 
-void FLUID::step(int startFrame)
+void FLUID::step(int framenr)
 {
 	// manta_write_effectors(this);                         // TODO in Mantaflow
 
 	// Run manta step and handover current frame number
 	mCommands.clear();
 	std::ostringstream manta_step;
-	manta_step <<  "manta_step_" << mCurrentID << "(" << startFrame << ")";
+	manta_step <<  "manta_step_" << mCurrentID << "(" << framenr << ")";
 	mCommands.push_back(manta_step.str());
 
 	runPythonString(mCommands);
diff --git a/intern/mantaflow/intern/manta_fluid_API.cpp b/intern/mantaflow/intern/manta_fluid_API.cpp
index 2acac08b911..ea33c381ce1 100644
--- a/intern/mantaflow/intern/manta_fluid_API.cpp
+++ b/intern/mantaflow/intern/manta_fluid_API.cpp
@@ -61,9 +61,9 @@ extern "C" void smoke_manta_export(FLUID* smoke, SmokeModifierData *smd)
 	smoke->exportSmokeData(smd);
 }
 
-extern "C" void smoke_step(FLUID *fluid, int startFrame)
+extern "C" void smoke_step(FLUID *fluid, int framenr)
 {
-	fluid->step(startFrame);
+	fluid->step(framenr);
 	fluid->updatePointers();
 	if (fluid->usingHighRes())
 		fluid->updatePointersHigh();
diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index 76ce36e8299..ea8473e2d6e 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -159,8 +159,8 @@ def liquid_post_step_high_$ID$():\n\
 //////////////////////////////////////////////////////////////////////
 
 const std::string liquid_adaptive_step = "\n\
-def manta_step_$ID$(start_frame):\n\
-    s$ID$.frame = start_frame\n\
+def manta_step_$ID$(framenr):\n\
+    s$ID$.frame = framenr\n\
     s$ID$.timeTotal = s$ID$.frame * dt0_s$ID$\n\
     last_frame_s$ID$ = s$ID$.frame\n\
     \n\
diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index 6118dee36dd..412d7b2d067 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -210,8 +210,8 @@ def smoke_post_step_high_$ID$():\n\
 //////////////////////////////////////////////////////////////////////
 
 const std::string smoke_adaptive_step = "\n\
-def manta_step_$ID$(start_frame):\n\
-    s$ID$.frame = start_frame\n\
+def manta_step_$ID$(framenr):\n\
+    s$ID$.frame = framenr\n\
     s$ID$.timeTotal = s$ID$.frame * dt0_s$ID$\n\
     last_frame_s$ID$ = s$ID$.frame\n\
     \n\
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 634457c4813..928b6e5b617 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2909,7 +2909,7 @@ static void update_effectors(Scene *scene, Object *ob, SmokeDomainSettings *sds,
 	pdEndEffectors(&effectors);
 }
 
-static void step(Scene *scene, Object *ob, SmokeModifierData *smd, DerivedMesh *domain_dm, float fps, int startFrame)
+static void step(Scene *scene, Object *ob, SmokeModifierData *smd, DerivedMesh *domain_dm, float fps, int framenr)
 {
 	SmokeDomainSettings *sds = smd->domain;
 	/* stability values copied from wturbulence.cpp */
@@ -2991,7 +2991,7 @@ static void step(Scene *scene, Object *ob, SmokeModifierData *smd, DerivedMesh *
 #ifndef WITH_MANTA
 			smoke_step(sds->fluid, gravity, dtSubdiv);
 #else
-			smoke_step(sds->fluid, startFrame);
+			smoke_step(sds->fluid, framenr);
 #endif
 		}
 	}
@@ -3312,7 +3312,7 @@ static void smokeModifier_process(SmokeModifierData *smd, Scene *scene, Object *
 				}
 #endif
 			}
-			step(scene, ob, smd, dm, scene->r.frs_sec / scene->r.frs_sec_base, startframe);
+			step(scene, ob, smd, dm, scene->r.frs_sec / scene->r.frs_sec_base, framenr);
 		}
 		// create shadows before writing cache so they get stored
 		if (sds->type == MOD_SMOKE_DOMAIN_TYPE_GAS) {