[Bf-blender-cvs] [9db08b77e4d] master: Fluid: Fix for refactor 99ee1de094a1

Sebastián Barschkis noreply at git.blender.org
Wed May 13 13:05:11 CEST 2020


Commit: 9db08b77e4d6b3564721a42391cbbcef08e04f9b
Author: Sebastián Barschkis
Date:   Wed May 13 13:04:49 2020 +0200
Branches: master
https://developer.blender.org/rB9db08b77e4d6b3564721a42391cbbcef08e04f9b

Fluid: Fix for refactor 99ee1de094a1

Fix incorrect file IO functions.

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

M	intern/mantaflow/intern/MANTA_main.cpp

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

diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index 6671fbc0d7d..11ce32fb828 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -797,13 +797,13 @@ void MANTA::initializeRNAMap(FluidModifierData *mmd)
   mRNAMap["FLAME_SMOKE_COLOR_X"] = to_string(mds->flame_smoke_color[0]);
   mRNAMap["FLAME_SMOKE_COLOR_Y"] = to_string(mds->flame_smoke_color[1]);
   mRNAMap["FLAME_SMOKE_COLOR_Z"] = to_string(mds->flame_smoke_color[2]);
-  mRNAMap["CURRENT_FRAME"] = to_string(mmd->time);
+  mRNAMap["CURRENT_FRAME"] = to_string(int(mmd->time));
   mRNAMap["START_FRAME"] = to_string(mds->cache_frame_start);
   mRNAMap["END_FRAME"] = to_string(mds->cache_frame_end);
-  mRNAMap["CACHE_DATA_FORMAT"] = to_string(mds->cache_data_format);
-  mRNAMap["CACHE_MESH_FORMAT"] = to_string(mds->cache_mesh_format);
-  mRNAMap["CACHE_NOISE_FORMAT"] = to_string(mds->cache_noise_format);
-  mRNAMap["CACHE_PARTICLE_FORMAT"] = to_string(mds->cache_particle_format);
+  mRNAMap["CACHE_DATA_FORMAT"] = getCacheFileEnding(mds->cache_data_format);
+  mRNAMap["CACHE_MESH_FORMAT"] = getCacheFileEnding(mds->cache_mesh_format);
+  mRNAMap["CACHE_NOISE_FORMAT"] = getCacheFileEnding(mds->cache_noise_format);
+  mRNAMap["CACHE_PARTICLE_FORMAT"] = getCacheFileEnding(mds->cache_particle_format);
   mRNAMap["SIMULATION_METHOD"] = simulationMethod;
   mRNAMap["FLIP_RATIO"] = to_string(mds->flip_ratio);
   mRNAMap["PARTICLE_RANDOMNESS"] = to_string(mds->particle_randomness);



More information about the Bf-blender-cvs mailing list