Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-02 00:44:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Automated] Merged develop into main

Browse source
This commit is contained in:
pypebot 2022-05-04 05:41:48 +02:00 • committed by GitHub
commit 700afa2d6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openpype/hosts/tvpaint/lib.py
View file

@ -573,7 +573,7 @@ def composite_rendered_layers(
layer_ids_by_position[layer_position] = layer["layer_id"]
# Sort layer positions
sorted_positions = tuple(sorted(layer_ids_by_position.keys()))
sorted_positions = tuple(reversed(sorted(layer_ids_by_position.keys())))
# Prepare variable where filepaths without any rendered content
# - transparent will be created
transparent_filepaths = set()

8
openpype/modules/base.py
View file

@ -306,11 +306,11 @@ def _load_modules():
basename, ext = os.path.splitext(filename)
if os.path.isdir(fullpath):
# Check existence of init fil
# Check existence of init file
init_path = os.path.join(fullpath, "__init__.py")
if not os.path.exists(init_path):
log.debug((
"Module directory does not contan __init__.py file {}"
"Module directory does not contain __init__.py file {}"
).format(fullpath))
continue
@ -353,11 +353,11 @@ def _load_modules():
basename, ext = os.path.splitext(filename)
if os.path.isdir(fullpath):
# Check existence of init fil
# Check existence of init file
init_path = os.path.join(fullpath, "__init__.py")
if not os.path.exists(init_path):
log.debug((
"Module directory does not contan __init__.py file {}"
"Module directory does not contain __init__.py file {}"
).format(fullpath))
continue

7
openpype/settings/defaults/project_settings/nuke.json
View file

@ -220,11 +220,12 @@
"repre_names": [
"exr",
"dpx",
"mov"
"mov",
"mp4",
"h264"
],
"loaders": [
"LoadSequence",
"LoadMov"
"LoadClip"
]
}
],