Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow loading levels/images with numeric names #3200

Merged
merged 2 commits into from
Apr 2, 2020
Merged

Allow loading levels/images with numeric names #3200

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ffeac3
Allow loading levels/images with numeric names.
martinvanzijl Feb 12, 2020
4e3671f
Use npos instead of -1. Remove second comment.
martinvanzijl Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion toonz/sources/common/tsystem/tfilepath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,8 @@ std::wstring TFilePath::getLevelNameW() const {
if (j == i || j - i == 1) // prova.tif o prova..tif
return str;

if (!checkForSeqNum(type) || !isNumbers(str, i, j)) return str;
if (!checkForSeqNum(type) || !isNumbers(str, i, j) ||
i == (int)std::wstring::npos) return str;
// prova.0001.tif
return str.erase(i + 1, j - i - 1);
}
Expand Down