[Bf-blender-cvs] [e32d03d] fluid-mantaflow: start frame for manta step was always one frame ahead

[Sebastián Barschkis]

Commit: e32d03d7bd455b9da1faa53dd54debf0a07f60ba
Author: Sebastián Barschkis
Date:   Sun May 15 02:20:04 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBe32d03d7bd455b9da1faa53dd54debf0a07f60ba

start frame for manta step was always one frame ahead

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

M	intern/mantaflow/intern/SMOKE.cpp

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

diff --git a/intern/mantaflow/intern/SMOKE.cpp b/intern/mantaflow/intern/SMOKE.cpp
index 9d836ff..7c35139 100644
--- a/intern/mantaflow/intern/SMOKE.cpp
+++ b/intern/mantaflow/intern/SMOKE.cpp
@@ -246,7 +246,7 @@ void SMOKE::step(SmokeModifierData *smd)
 
 	// Get the frame number for this step
 	ModifierData *md = ((ModifierData*) smd);
-	int startFrame = md->scene->r.cfra;
+	int startFrame = md->scene->r.cfra - 1; // Current frame is always one ahead
 	
 	// Run manta step and handover current frame number
 	mCommands.clear();
@@ -462,7 +462,7 @@ std::string SMOKE::parseLine(const std::string& line, SmokeModifierData *smd)
 	bool readingVar = false;
 	const char delimiter = '$';
 	while (currPos < line.size()) {
-		if (line[currPos] == delimiter && ! readingVar) {
+		if (line[currPos] == delimiter && !readingVar) {
 			readingVar  = true;
 			start_del   = currPos + 1;
 			res        += line.substr(end_del + 1, currPos - end_del -1);