Merge branch 'release/2.12.0' into develop

This commit is contained in:
Milan Kolar 2020-09-09 16:58:54 +02:00
commit 499ccbb436
133 changed files with 6028 additions and 2720 deletions

View file

@ -57,8 +57,8 @@ class CelactionPrelaunchHook(PypeHook):
self.log.info(f"Work dir is: `{workdir}`")
# get last version of workfile
workfile_last = get_last_version_from_path(
workdir, workfile.split(version))
workfile_last = env.get("AVALON_LAST_WORKFILE")
self.log.debug(f"_ workfile_last: `{workfile_last}`")
if workfile_last:
workfile = workfile_last
@ -107,7 +107,7 @@ class CelactionPrelaunchHook(PypeHook):
f"--asset {asset}",
f"--task {task}",
"--currentFile \\\"\"*SCENE*\"\\\"",
"--chunk *CHUNK*",
"--chunk 10",
"--frameStart *START*",
"--frameEnd *END*",
"--resolutionWidth *X*",