diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-07-03 16:27:02 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-07-03 16:27:02 +0300 |
| commit | 1e255ce0319d6cf45b6951a2a87590d2ca236e9f (patch) | |
| tree | b5f47ea26bcad96e1205b2e9c59bd422e364a148 /intern/mantaflow/intern/strings/fluid_script.h | |
| parent | 2633683b52054d15006aea1314f62f73a8505b42 (diff) | |
Fix T72214: Fluids: noise does not work with negative frame numbers
The issue is duplicated code. There are two functions that zero-fill
the frame number. They worked the same for positive frames numbers, but
behaved differently for negative ones.
On frame `-100`, `BLI_path_frame` outputs `-0100` and
`fluid_cache_get_framenr_formatted_$ID$` outputted `-100`.
I changed the behavior of the latter, because we depend on the behavior
of the former for much longer already.
Reviewers: sebbas
Differential Revision: https://developer.blender.org/D8107
Diffstat (limited to 'intern/mantaflow/intern/strings/fluid_script.h')
| -rw-r--r-- | intern/mantaflow/intern/strings/fluid_script.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/mantaflow/intern/strings/fluid_script.h b/intern/mantaflow/intern/strings/fluid_script.h index b166ab585b0..977b99e7759 100644 --- a/intern/mantaflow/intern/strings/fluid_script.h +++ b/intern/mantaflow/intern/strings/fluid_script.h @@ -502,10 +502,12 @@ gc.collect()\n"; // BAKE ////////////////////////////////////////////////////////////////////// +/* This has to match the behavior of BLI_path_frame, + * for positive and negative frame numbers. */ const std::string fluid_cache_helper = "\n\ def fluid_cache_get_framenr_formatted_$ID$(framenr):\n\ - return str(framenr).zfill(4) # framenr with leading zeroes\n"; + return str(framenr).zfill(4) if framenr >= 0 else str(framenr).zfill(5)\n"; const std::string fluid_bake_multiprocessing = "\n\ |