Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastián Barschkis <sebbas@sebbas.org>2020-05-13 14:04:49 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2020-05-13 14:05:01 +0300
commit9db08b77e4d6b3564721a42391cbbcef08e04f9b (patch)
tree71c6ee461575a179471eafd8ef000b76ed91fee2 /intern/mantaflow
parent498bd0772ec54601241911b6a98f4fedf97d9166 (diff)
Fluid: Fix for refactor 99ee1de094a1
Fix incorrect file IO functions.
Diffstat (limited to 'intern/mantaflow')
-rw-r--r--intern/mantaflow/intern/MANTA_main.cpp10
1 files changed, 5 insertions, 5 deletions
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);