diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-09-22 12:42:18 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-09-22 15:02:53 +0300 |
| commit | edd19c1df91179f283fb5c62f8d041ba43b0fb05 (patch) | |
| tree | da38e0a5a89a3a2587219c9ca41dab77128466cd /intern/mantaflow/intern | |
| parent | 97ec16d68f3cf0f81b3de52a7b7c51b8977e943c (diff) | |
Fluid: Fix for script export (standalone mode)
The OpenVDB update added a load() function. This function clashes with a helper IO function (only used when exporting and running the simulation externally) that was also named load().
Diffstat (limited to 'intern/mantaflow/intern')
| -rw-r--r-- | intern/mantaflow/intern/strings/fluid_script.h | 2 | ||||
| -rw-r--r-- | intern/mantaflow/intern/strings/liquid_script.h | 2 | ||||
| -rw-r--r-- | intern/mantaflow/intern/strings/smoke_script.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/mantaflow/intern/strings/fluid_script.h b/intern/mantaflow/intern/strings/fluid_script.h index 73b92a76ec4..65773221042 100644 --- a/intern/mantaflow/intern/strings/fluid_script.h +++ b/intern/mantaflow/intern/strings/fluid_script.h @@ -769,7 +769,7 @@ while current_frame_s$ID$ <= end_frame_s$ID$:\n\ \n\ # Load already simulated data from cache:\n\ if loop_cnt < from_cache_cnt:\n\ - load(current_frame_s$ID$, cache_resumable)\n\ + load_data(current_frame_s$ID$, cache_resumable)\n\ \n\ # Otherwise simulate new data\n\ else:\n\ diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h index 13b8c0a9c78..c4e4efe46a4 100644 --- a/intern/mantaflow/intern/strings/liquid_script.h +++ b/intern/mantaflow/intern/strings/liquid_script.h @@ -476,7 +476,7 @@ def liquid_save_particles_$ID$(path, framenr, file_format, resumable):\n\ const std::string liquid_standalone = "\n\ # Helper function to call cache load functions\n\ -def load(frame, cache_resumable):\n\ +def load_data(frame, cache_resumable):\n\ liquid_load_data_$ID$(os.path.join(cache_dir, 'data'), frame, file_format_data, cache_resumable)\n\ if using_sndparts_s$ID$:\n\ liquid_load_particles_$ID$(os.path.join(cache_dir, 'particles'), frame, file_format_data, cache_resumable)\n\ diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h index 0d50a730b2d..370ffa0cc85 100644 --- a/intern/mantaflow/intern/strings/smoke_script.h +++ b/intern/mantaflow/intern/strings/smoke_script.h @@ -598,7 +598,7 @@ def smoke_save_noise_$ID$(path, framenr, file_format, resumable):\n\ const std::string smoke_standalone = "\n\ # Helper function to call cache load functions\n\ -def load(frame, cache_resumable):\n\ +def load_data(frame, cache_resumable):\n\ smoke_load_data_$ID$(os.path.join(cache_dir, 'data'), frame, file_format_data, cache_resumable)\n\ if using_noise_s$ID$:\n\ smoke_load_noise_$ID$(os.path.join(cache_dir, 'noise'), frame, file_format_data, cache_resumable)\n\ |