Fix Windows incompatibility when using Shaman URLs as job storage path

The Shaman URL check was done on the wrong string, which went unnoticed
on Linux because an URL is a valid file path. However, on Windows this is
not the case, and thus caused problems. This is now fixed.
This commit is contained in:
Sybren A. Stüvel 2021-07-29 19:33:36 +02:00
parent 25150397c0
commit 6285826bfc
2 changed files with 6 additions and 1 deletions

View File

@ -1,5 +1,10 @@
# Blender Cloud changelog # Blender Cloud changelog
## Version 1.22 (in development)
- Fix Windows incompatibility when using Shaman URLs as job storage path.
## Version 1.21 (2021-07-27) ## Version 1.21 (2021-07-27)
- Bump blender-asset-tracer version 1.5.1 → 1.6, for better compatibility with Geometry Nodes. - Bump blender-asset-tracer version 1.5.1 → 1.6, for better compatibility with Geometry Nodes.

View File

@ -271,7 +271,7 @@ def is_file_inside_job_storage(prefs, current_file: typing.Union[str, Path]) ->
if isinstance(current_file, str): if isinstance(current_file, str):
# Shaman URLs are always remote, so the current file cannot be in there. # Shaman URLs are always remote, so the current file cannot be in there.
if is_shaman_url(current_file): if is_shaman_url(prefs.flamenco_job_file_path):
return False return False
current_file = Path(current_file) current_file = Path(current_file)