Commit graph

6526 commits

Author SHA1 Message Date
Roy Nieterau
74971bd3dc Cosmetics 2025-12-15 22:14:14 +01:00
Roy Nieterau
69de145bb7 Merge branch 'develop' of https://github.com/ynput/ayon-core into enhancement/1524-yn-0156-usd-contribution-workflow-layer-strength-configured-hierarchically
# Conflicts:
#	client/ayon_core/plugins/publish/extract_usd_layer_contributions.py
2025-12-15 22:13:14 +01:00
Roy Nieterau
34004ac538
Merge branch 'develop' into 1595-yn-0304-usd-contributions-customizable-order-strength-per-instance 2025-12-15 20:29:12 +01:00
Mustafa Zaky Jafar
362995d5f7
Merge branch 'develop' into enhancement/1524-yn-0156-usd-contribution-workflow-layer-strength-configured-hierarchically 2025-12-15 20:01:31 +02:00
Jakub Trllo
0cfc959875 swap order of kwargs 2025-12-15 14:25:51 +01:00
Jakub Trllo
a2387d1856 require kwargs 2025-12-15 14:09:27 +01:00
Jakub Trllo
5ca04b0d6e Merge branch 'develop' into enhancement/improve_oiio_info_performance
# Conflicts:
#	client/ayon_core/lib/transcoding.py
2025-12-15 14:07:39 +01:00
Jakub Trllo
bd2e26ea50 use 'verbose=False' at other places 2025-12-15 14:03:27 +01:00
Jakub Trllo
6558af5ff1
Merge branch 'develop' into enhancement/AY-6586_Thumbnail_presets 2025-12-15 12:02:15 +01:00
Roy Nieterau
e19ca9e1d1
Merge branch 'develop' into 1595-yn-0304-usd-contributions-customizable-order-strength-per-instance 2025-12-12 22:54:17 +01:00
Roy Nieterau
be2dd92a7e Merge branch 'enhancement/1524-yn-0156-usd-contribution-workflow-layer-strength-configured-hierarchically' of https://github.com/BigRoy/ayon-core into enhancement/1524-yn-0156-usd-contribution-workflow-layer-strength-configured-hierarchically 2025-12-12 22:53:25 +01:00
Roy Nieterau
e2251ed76c
Merge branch 'develop' into enhancement/1524-yn-0156-usd-contribution-workflow-layer-strength-configured-hierarchically 2025-12-12 22:53:16 +01:00
Roy Nieterau
c93eb31b54 Fix typo 2025-12-12 22:53:05 +01:00
Roy Nieterau
2871ecac7d Fix setting the correct order 2025-12-12 22:52:52 +01:00
Roy Nieterau
7e1720d740
Merge branch 'develop' into 1600-collect-versions-loaded-in-scene-fails-in-unreal-due-to-lack-of-name-key-in-containers 2025-12-12 22:41:35 +01:00
Roy Nieterau
6f534f4ff0
Update client/ayon_core/plugins/publish/collect_scene_loaded_versions.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2025-12-12 22:41:28 +01:00
Petr Kalis
9da077b52f
Merge branch 'develop' into enhancement/AY-6586_Thumbnail_presets 2025-12-12 16:39:39 +01:00
Petr Kalis
52e4932c97 Used renamed class name as variable 2025-12-12 16:39:22 +01:00
Jakub Trllo
65791a1d9f added 'skip_discovery' to loader plugin 2025-12-12 15:03:31 +01:00
Jakub Trllo
4faf61dd22 add logic description 2025-12-12 15:01:04 +01:00
Jakub Trllo
d0034b6007 use 'skip_discovery' instead 2025-12-12 15:00:51 +01:00
Jakub Trllo
2e1c9a3afb
Merge branch 'develop' into 1600-collect-versions-loaded-in-scene-fails-in-unreal-due-to-lack-of-name-key-in-containers 2025-12-12 14:13:46 +01:00
Jakub Trllo
70328e53c6
Merge branch 'develop' into enhancement/skip-base-classes 2025-12-12 12:58:08 +01:00
Jakub Trllo
deb93bc95b
Merge branch 'develop' into enhancement/transcoding_oiio_tool_for_ffmpeg_one_call 2025-12-12 12:56:30 +01:00
Jakub Trllo
15b0192d4e
move step next to frames
Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2025-12-12 12:54:17 +01:00
Jakub Trllo
ea2642ab15 added resolution and pixel aspect to version 2025-12-12 12:21:06 +01:00
Petr Kalis
8fe830f5de Merge branch 'enhancement/AY-6586_Thumbnail_presets' of https://github.com/ynput/ayon-core into enhancement/AY-6586_Thumbnail_presets 2025-12-12 11:03:01 +01:00
Petr Kalis
f03ae1bc15 Formatting change 2025-12-12 10:59:02 +01:00
Petr Kalis
41fa48dbe7 Formatting change 2025-12-12 10:57:19 +01:00
Petr Kalis
3dbba063ca Renamed variables 2025-12-12 10:57:02 +01:00
Petr Kalis
4d8d9078b8 Returned None
IDK why, comment, must be really important though.
2025-12-12 10:56:39 +01:00
Roy Nieterau
2a7316b262 Type hints to the arguments 2025-12-12 10:40:10 +01:00
Roy Nieterau
fef45cebb3 Merge branch 'enhancement/transcoding_oiio_tool_for_ffmpeg_one_call' of https://github.com/BigRoy/ayon-core into enhancement/transcoding_oiio_tool_for_ffmpeg_one_call 2025-12-12 10:33:06 +01:00
Roy Nieterau
f9ca97ec71 Perform actual type hint 2025-12-12 10:32:54 +01:00
Roy Nieterau
af901213a2
Update client/ayon_core/lib/transcoding.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2025-12-12 10:31:54 +01:00
Roy Nieterau
11ecc69b35 Refactor _input -> input_item 2025-12-12 10:31:25 +01:00
Roy Nieterau
82427cb004 Fix merge conflicts 2025-12-12 10:21:45 +01:00
Roy Nieterau
197b74d1af Merge branch 'develop' of https://github.com/ynput/ayon-core into enhancement/transcoding_oiio_tool_for_ffmpeg_one_call
# Conflicts:
#	client/ayon_core/plugins/publish/extract_color_transcode.py
2025-12-12 10:20:05 +01:00
Roy Nieterau
048cbddb43
Merge branch 'develop' into enhancement/1524-yn-0156-usd-contribution-workflow-layer-strength-configured-hierarchically 2025-12-11 15:56:21 +01:00
Roy Nieterau
b6709f9859 Also remove fallback for current folder in _get_folder_path 2025-12-11 15:36:45 +01:00
Roy Nieterau
2aaca57672
Merge branch 'develop' into 1598-publisher-create-enforces-current-task-if-no-task-is-selected-inside-dcc 2025-12-11 15:33:47 +01:00
Roy Nieterau
5e674844b5 Cosmetics 2025-12-10 22:19:12 +01:00
Roy Nieterau
e3206796a7 Fix #1600: Filter out containers that lack required keys (looking at you ayon-unreal!) 2025-12-10 22:16:03 +01:00
Roy Nieterau
aff0ecf436 Fix #1598: Do not fallback to current task name 2025-12-10 20:29:10 +01:00
Petr Kalis
82dd0d0a76
Merge branch 'develop' into enhancement/AY-6586_Thumbnail_presets 2025-12-10 17:33:00 +01:00
Roy Nieterau
4eece5e6e9 Allow to define department layers scoped only to a particular department layer type, e.g. "shot" versus "asset". This way, you can scope same layer names for both shot and asset at different orders if they have differing target scopes 2025-12-10 16:55:44 +01:00
Roy Nieterau
9cdecbdee0
Merge branch 'develop' into 1595-yn-0304-usd-contributions-customizable-order-strength-per-instance 2025-12-10 16:35:49 +01:00
Roy Nieterau
ced9eadd3d Use the instance attribute Strength order as the in-layer order completely so that it's the exact value, not an offset to the department layer order 2025-12-10 16:31:05 +01:00
Jakub Trllo
17b09d608b unify indentation 2025-12-10 16:03:30 +01:00
Jakub Trllo
bceb645a80
fix typo
Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2025-12-10 15:47:14 +01:00