Blender Git Loki

Git Commits -> Revision 0333cf0

Revision 0333cf0 by Sybren A. Stüvel (master)
March 20, 2019, 12:42 (GMT)
Fix BLI_path_frame_strip

The `BLI_path_frame_strip` function was completely broken, unless the
number of digits in the sequence number was the same as the length of
the extension. In other words, it would work fine for `file.0001.abc` (4
digit `0001` and 4 char `.abc`), but other combinations would truncate
to the shortest (`file.001.abc` would become `file.###.ab` and
`file.00001.a` would become `file.##.a`). The dependency between the
sequence number and the file extension is now removed.

The behaviour has changed a little bit in the case where there are no
numbers in the filename. Previously, `path="filename.abc"` would result
in `path="filename.abc"` and `ext=""`, but now it results in
`path="filename"` and `ext=".abc"`. This way `ext` always contains the
extension, and the behaviour is consistent regardless of whether there
were any numbers found.

Furthermore, I've removed the `bool set_frame_char` parameter, because
it was unclear, probably also buggy, and most importantly, never used.

I've also added a unit test for the `BLI_path_frame_strip` function.

Commit Details:

Full Hash: 0333cf00baf4d5b796347334af1f15d5bb9a2df4
Parent Commit: 8b9b342
Lines Changed: +33, -13

5 Modified Paths:

/source/blender/blenkernel/intern/cachefile.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_path_util.h (+1, -1) (Diff)
/source/blender/blenlib/intern/path_util.c (+8, -10) (Diff)
/source/blender/editors/space_sequencer/sequencer_add.c (+1, -1) (Diff)
/tests/gtests/blenlib/BLI_path_util_test.cc (+22, -0) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021