Commit graph

2896 commits

Author SHA1 Message Date
Petr Kalis
2b899008d2
Merge branch 'develop' into bugfix/AY-1232_Dirmap-does-not-work-with-sitesync 2024-07-03 13:34:03 +02:00
Roy Nieterau
a5e46436d1 Remove unused imports 2024-07-02 13:17:01 +02:00
Roy Nieterau
8d37f49953 Cosmetics: Move argument order to match function signature 2024-07-02 12:18:44 +02:00
Roy Nieterau
379d610829 Make ext argument required but allow None 2024-07-02 12:17:21 +02:00
Roy Nieterau
2b594f3365 Remove get_template_data_with_names call as this should already have been collected in other Collectors for that. 2024-07-01 22:23:06 +02:00
Roy Nieterau
5f9cb3d550 Fix contribution layers from settings 2024-07-01 22:19:35 +02:00
Roy Nieterau
9b82215674 Cosmetics 2024-07-01 22:13:07 +02:00
Roy Nieterau
afabfeb25e Add comment 2024-07-01 22:11:01 +02:00
Roy Nieterau
2d340739e1 Support plug-in enabled state 2024-07-01 20:57:23 +02:00
Roy Nieterau
5b557213d8 Move comment along 2024-07-01 20:49:29 +02:00
Roy Nieterau
61ed277655 Expose contribution department layers and strengths to settings 2024-07-01 20:48:02 +02:00
Roy Nieterau
7f94167abc
Update client/ayon_core/plugins/publish/extract_usd_layer_contributions.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2024-07-01 12:54:19 +02:00
Petr Kalis
1298cb5a76 AY-1232 - use faster method to check site sync enabled on project 2024-07-01 12:04:00 +02:00
Petr Kalis
d4e90a4eb2 AY-1232 - used addon's get_site_root_overrides
Addon's get_site_root_overrides should return overridden root values for any site which is overridden by Site Settings.
'studio' site is currently overridden by `Roots` tab and comes from project settings directly.
2024-07-01 12:03:28 +02:00
Petr Kalis
1ef840f0cb AY-1232 - removed unnecessary get_site_local_overrides
Has wrong arguments, it would require SiteSync addon. Used only in dirmap file, where it could be replaced directly by SiteSync addon's method.
2024-07-01 11:57:32 +02:00
Roy Nieterau
e1010f9853 Fix code
Traceback:
```
Traceback (most recent call last):
  File "C:\Users\User\AppData\Local\Ynput\AYON\dependency_packages\ayon_2403061937_windows.zip\dependencies\pyblish\plugin.py", line 527, in __explicit_process
    runner(*args)
  File "E:\dev\ayon-core\client\ayon_core\plugins\publish\extract_usd_layer_contributions.py", line 556, in process
    path = get_instance_uri_path(contribution.instance)
  File "E:\dev\ayon-core\client\ayon_core\plugins\publish\extract_usd_layer_contributions.py", line 163, in get_instance_uri_path
    path = construct_ayon_entity_uri(
  File "E:\dev\ayon-core\client\ayon_core\pipeline\entity_uri.py", line 75, in construct_ayon_entity_uri
    if version < 0:
TypeError: '<' not supported between instances of 'str' and 'int'
```
2024-06-28 17:17:30 +02:00
Roy Nieterau
25ada3029f Cosmetics 2024-06-28 17:09:14 +02:00
Roy Nieterau
2a49e4fed5 Merge branch 'develop' of https://github.com/ynput/ayon-core into enhancement/usd_workflow
# Conflicts:
#	client/ayon_core/pipeline/load/utils.py
2024-06-28 17:07:49 +02:00
Roy Nieterau
537676d992 Opt-out early 2024-06-28 17:05:33 +02:00
Roy Nieterau
90eeba01ab Refactor and move more functions to better locations 2024-06-28 17:04:28 +02:00
Roy Nieterau
d49a66eb7c Refactor functions based on @iLLiCiTiT comments 2024-06-28 16:52:39 +02:00
Roy Nieterau
dca474e7d1 Merge branch 'enhancement/usd_workflow' of https://github.com/BigRoy/ayon-core into enhancement/usd_workflow 2024-06-28 15:52:35 +02:00
Roy Nieterau
22a89dc521 Refactor ayon_core.pipeline.ayon_uri to ayon_core.pipeline.entity_uri` 2024-06-28 15:52:21 +02:00
Roy Nieterau
399eb86360 Move usdlib to ayon_core.pipeline 2024-06-28 15:49:51 +02:00
Roy Nieterau
3d42b7858c
Update client/ayon_core/lib/usdlib.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2024-06-28 15:40:52 +02:00
Roy Nieterau
472868f89d
Update client/ayon_core/pipeline/ayon_uri.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2024-06-28 15:40:31 +02:00
Roy Nieterau
d4d11e8fa1 Remove tag because Layer init does not take the argument 2024-06-28 15:39:54 +02:00
Roy Nieterau
068efca228 Add docstring 2024-06-28 15:39:32 +02:00
Roy Nieterau
207c9e91ce Cosmetics 2024-06-28 15:27:24 +02:00
Roy Nieterau
299e2cfd57 Fix dosctrings 2024-06-28 15:27:08 +02:00
Roy Nieterau
ee1cb86da3 Refactor function names 2024-06-28 15:01:44 +02:00
Roy Nieterau
e0f6cf3e1b Fix typing 2024-06-28 15:00:45 +02:00
Roy Nieterau
5d2d6b4178 Merge branch 'enhancement/usd_workflow' of https://github.com/BigRoy/ayon-core into enhancement/usd_workflow 2024-06-28 15:00:21 +02:00
Roy Nieterau
27342f55af
Apply suggestions from code review by iLliCiTiT
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2024-06-28 14:47:15 +02:00
Roy Nieterau
b3317139c2
Update client/ayon_core/pipeline/ayon_uri.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2024-06-28 14:41:29 +02:00
Roy Nieterau
a415a837de Fix docstring 2024-06-28 14:39:17 +02:00
Jakub Trllo
3c927eb4fb group invalid representaion ids under same group 2024-06-28 14:17:10 +02:00
Jakub Trllo
d6e047cd1d fox string concatenation 2024-06-28 14:16:52 +02:00
Roy Nieterau
018d71766d Fix type hints + reduce imports 2024-06-28 12:50:58 +02:00
Jakub Trllo
901a60f56a get version items only for valid repre info 2024-06-28 10:31:33 +02:00
Roy Nieterau
32abe114c1
Merge branch 'develop' into enhancement/usd_workflow 2024-06-28 09:01:25 +02:00
Jakub Trllo
cff6add784 added more validations to load utils 2024-06-27 18:18:10 +02:00
Jakub Trllo
1a1fce289d thow container in UI 2024-06-27 18:12:22 +02:00
Jakub Trllo
18bd94eb53 ignore containers with invalid UUID in representation 2024-06-27 18:09:48 +02:00
Jakub Trllo
6cbb317ba6 remove Literal typehint 2024-06-27 17:32:04 +02:00
Roy Nieterau
b180c5c43d Merge branch 'develop' of https://github.com/ynput/ayon-core into enhancement/usd_workflow
# Conflicts:
#	server_addon/houdini/client/ayon_houdini/version.py
#	server_addon/houdini/package.py
2024-06-27 16:21:06 +02:00
Roy Nieterau
0e4a9e8911 Fix unpacking 2024-06-27 15:42:14 +02:00
Jakub Trllo
e4243a29a4
Merge branch 'develop' into enhancement/AY-5916_Separate-backend-into-modelsapi 2024-06-27 13:44:26 +02:00
Jakub Trllo
e80ed7800f
Merge branch 'develop' into enhancement/AY-5916_Separate-backend-into-modelsapi 2024-06-25 18:17:07 +02:00
Roy Nieterau
dc0378fdd0
Merge branch 'develop' into enhancement/hero_version_disable_hardlinks_setting 2024-06-25 15:09:31 +02:00