[Bf-blender-cvs] [80c53eb3cf0] fluid-mantaflow: small fixes for manta script export

Sebastián Barschkis noreply at git.blender.org
Mon Jul 30 17:26:47 CEST 2018


Commit: 80c53eb3cf0654bc24e76e2b30df2eb3a247764e
Author: Sebastián Barschkis
Date:   Mon Jul 30 16:15:37 2018 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB80c53eb3cf0654bc24e76e2b30df2eb3a247764e

small fixes for manta script export

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

M	intern/mantaflow/intern/FLUID.cpp

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

diff --git a/intern/mantaflow/intern/FLUID.cpp b/intern/mantaflow/intern/FLUID.cpp
index f6cdd07fe50..f10224f134d 100644
--- a/intern/mantaflow/intern/FLUID.cpp
+++ b/intern/mantaflow/intern/FLUID.cpp
@@ -802,7 +802,7 @@ std::string FLUID::getRealValue(const std::string& varName,  SmokeModifierData *
 	else if (varName == "FLAME_SMOKE_COLOR_Z")
 		ss << smd->domain->flame_smoke_color[2];
 	else if (varName == "CURRENT_FRAME")
-		ss << md->scene->r.cfra - 1;
+		ss << md->scene->r.cfra;
 	else if (varName == "PARTICLE_RANDOMNESS")
 		ss << smd->domain->particle_randomness;
 	else if (varName == "PARTICLE_NUMBER")
@@ -894,9 +894,7 @@ std::string FLUID::getRealValue(const std::string& varName,  SmokeModifierData *
 	else if (varName == "GRAVITY_Z")
 		ss << smd->domain->gravity[2];
 	else if (varName == "CACHE_DIR") {
-		char parent_dir[1024];
-		BLI_split_dir_part(smd->domain->cache_directory, parent_dir, sizeof(parent_dir));
-		ss << parent_dir;
+		ss << smd->domain->cache_directory;
 	} else if (varName == "ID")
 		ss << mCurrentID;
 	else if (varName == "USING_ADAPTIVETIME")



More information about the Bf-blender-cvs mailing list