Commit graph

194 commits

Author SHA1 Message Date
Jakub Jezek
d7db8b0090
renaming menu to ayon 2023-11-30 12:03:03 +01:00
Jakub Jezek
7c25e4a664
fixing the logic from @bigroy
https://github.com/ynput/OpenPype/pull/5863/files#r1381847587
2023-11-28 21:49:05 +01:00
Jakub Ježek
497e3ec962
Update openpype/hosts/resolve/api/plugin.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-11-28 21:32:42 +01:00
Jakub Ježek
b438cbbf77
Merge branch 'develop' into bugfix/OP-6951_resolve_db_duration_calculation 2023-11-28 08:06:07 +01:00
Jakub Trllo
a31214d2c4 use 'newAssetPublishing' instead of 'isEditorial' 2023-11-21 11:05:55 +01:00
Jakub Jezek
b643c7c8b7
Merge branch 'feature/OP-7190_Use-folder-path-as-identifier-in-editorial' into feature/OP-7238_Use-folder-path-as-identifier-Resolve-editorial 2023-11-15 11:37:09 +01:00
Jakub Trllo
a28d6d34d2 Merge branch 'develop' into feature/OP-7176_Use-folder-path-as-unique-identifier
# Conflicts:
#	openpype/client/server/entities.py
#	openpype/pipeline/context_tools.py
2023-11-13 16:39:09 +01:00
Jakub Jezek
573da36d4b
workfile instance with support of folder path 2023-11-09 16:32:20 +01:00
Jakub Jezek
d07898a328
resolve: collect instances with folder path 2023-11-09 15:47:50 +01:00
Jakub Jezek
0b8dde2687
resolve: creating clips with folder path
also converting dict() to {}
2023-11-09 15:47:14 +01:00
Jakub Ježek
24c2677c7c
Merge branch 'develop' into bugfix/OP-6951_resolve_db_duration_calculation 2023-11-09 14:44:07 +01:00
Jakub Jezek
85bad0ae3d
hound 2023-11-09 14:42:30 +01:00
Jakub Jezek
6fa92ebc14
resolve: clip data should be integer rather then timecode 2023-11-09 14:40:33 +01:00
Jakub Ježek
80d441ab3f
Merge pull request #5691 from BigRoy/enhancement/resolve_save_current_file
Resolve: Add save current file button + "Save" shortcut when menu is active
2023-11-09 14:37:52 +01:00
Jakub Jezek
2c0d1b5c2b
improving the logic for handles operation 2023-11-09 13:56:08 +01:00
Jakub Trllo
cf4590f532 Merge branch 'develop' into feature/OP-7176_Use-folder-path-as-unique-identifier 2023-11-07 14:38:04 +01:00
Jakub Jezek
e5e278201b
better code explanation 2023-11-03 16:18:04 +01:00
Jakub Jezek
382ad931c6
resolve: frame duration and handles operation 2023-11-03 14:13:08 +01:00
Roy Nieterau
3e92c00546 Merge remote-tracking branch 'origin/enhancement/resolve_save_current_file' into enhancement/resolve_save_current_file 2023-10-30 23:48:17 +01:00
Roy Nieterau
32e88ebc96 Show workfiles tool if current file is not set to make it clear there's user interaction needed to save 2023-10-30 23:47:53 +01:00
Jakub Trllo
130693b798 use 'AYON_SERVER_ENABLED' in resolve plugin 2023-10-26 18:24:42 +02:00
Jakub Ježek
52bcab6f16
Merge branch 'develop' into enhancement/resolve_save_current_file 2023-10-26 16:57:57 +02:00
Jakub Trllo
e34c0b9ecd avoid unnecessary call to database 2023-10-24 18:50:54 +02:00
Jakub Trllo
9d617db64c use only folder name to create instance name 2023-10-24 18:46:35 +02:00
Jakub Jezek
aa74d48836
clip duration from Frames clip attributes 2023-10-18 14:00:57 +02:00
Jakub Jezek
ed2756aa52
improving code readability 2023-10-18 13:05:23 +02:00
Jakub Jezek
fbc24f5654
make sure handles on timeline are included only if available or demanded 2023-10-18 12:48:50 +02:00
Jakub Jezek
a11467883b
getting fps from timeline instead of project 2023-10-18 12:34:12 +02:00
Jakub Jezek
a810dfe78a
fixing assert message 2023-10-18 12:30:57 +02:00
Jakub Jezek
435408dc14
create_timeline_item with backward comapatibility 2023-10-17 17:47:23 +02:00
Jakub Ježek
3bbc3d0489
Update openpype/hosts/resolve/api/lib.py
Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2023-10-17 17:42:46 +02:00
Jakub Jezek
9e61d7e371
removing debug printing 2023-10-17 17:39:10 +02:00
Jakub Jezek
423dae2e18
Merge branch 'develop' into enhancement/OP-6951_Resolve-load-clip-to-timeline-at-set-time 2023-10-17 15:37:01 +02:00
Jakub Jezek
b1ea0b099d
merging if conditions for handles exclusion
also updating docstring
2023-10-17 15:32:42 +02:00
Jakub Jezek
f03be42e9d
resolve: improving key calling from version data 2023-10-12 15:30:39 +02:00
Jakub Jezek
61f381cb5c
resolve: make sure of file existence 2023-10-12 15:20:51 +02:00
Jakub Jezek
9145072d51
resolve: get representation files from host api plugin
and as suggested here https://github.com/ynput/OpenPype/pull/5673#discussion_r1350315699
2023-10-10 22:50:11 +02:00
Jakub Jezek
366bfb2435
hound 2023-10-09 15:30:37 +02:00
Jakub Jezek
26b2817a70
refactor loading for abstracted get_representation_files 2023-10-09 13:58:19 +02:00
Roy Nieterau
26bbb702df Implement legacy logic where we remove the pype tag in older versions of Resolve
- Unfortunately due to API limitations cannot remove the TimelineItem from the Timeline in old versions of Resolve
2023-10-07 20:04:21 +02:00
Roy Nieterau
708aef0537 Code cosmetics 2023-10-07 20:02:10 +02:00
Roy Nieterau
96abc90f0e Merge branch 'bugfix/OP-6952_Resolve-broken-version-management-for-loaded-containers' of https://github.com/pypeclub/OpenPype into bugfix/resolve_fix_manage_load_clip 2023-10-07 19:52:41 +02:00
Roy Nieterau
23efd3230f
Merge branch 'develop' into bugfix/OP-6952_Resolve-broken-version-management-for-loaded-containers 2023-10-07 19:46:16 +02:00
Roy Nieterau
bb74f9b3ba Cosmetics 2023-10-07 19:45:49 +02:00
Roy Nieterau
2932debbaf Cleanup + fix updating/remove logic
- Use container `_timeline_item` to ensure we act on the expected timeline item - otherwise `lib.get_pype_timeline_item_by_name` can take the wrong one if the same subset is loaded more than once which made update/remove actually pick an unexpected timeline item.
- On update, remove media pool item if previous version now has no usage
- On remove, only remove media pool item if it has no usage
- Don't duplicate logic to define version data to put in tag data, now uses a `get_tag_data` method
- Don't create a `fake context` but use the `get_representation_context` to get the context on load to ensure whatever uses it has the correct context.
2023-10-07 19:45:23 +02:00
Roy Nieterau
d405c5963b Merge branch 'develop' of https://github.com/pypeclub/OpenPype into bugfix/OP-6952_Resolve-broken-version-management-for-loaded-containers 2023-10-07 12:51:23 +02:00
Jakub Ježek
e03fe24a07
Update openpype/hosts/resolve/plugins/load/load_clip.py
Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2023-10-06 18:18:28 +02:00
Roy Nieterau
f94cd729f6 Refactor to new style host 2023-10-06 17:49:20 +02:00
Roy Nieterau
8641dbdfd5 Merge remote-tracking branch 'upstream/develop' into enhancement/resolve_save_current_file 2023-10-06 17:48:11 +02:00
Jakub Jezek
c51ed6409c
removing also timeline item 2023-10-06 15:51:47 +02:00