Commit graph

18647 commits

Author SHA1 Message Date
Jakub Trllo
4ce12ffc7c
Merge pull request #2602 from Moonrock-Animation-Studio/enhancement/ftrack-family-mapping-settings
Ftrack: Family to Asset type mapping is in settings
2022-02-02 12:52:12 +01:00
Milan Kolar
49285bb859
Merge pull request #2617 from BigRoy/typos_website_docs 2022-02-02 10:52:16 +01:00
pypebot
6eece7ed6a
[Automated] Merged main into develop 2022-02-02 04:37:37 +01:00
OpenPype
b27ebb6fbe [Automated] Bump version 2022-02-02 03:37:27 +00:00
pypebot
e1cd35585f
[Automated] Merged develop into main 2022-02-02 04:31:27 +01:00
Jakub Ježek
656e6d49e9
Merge pull request #2590 from pypeclub/bugfix/hiero-otio-review-publishing
Global: fix broken otio review extractor
2022-02-01 20:59:14 +01:00
unknown
1684ea0dc3 even more formatting fixes 2022-02-01 17:25:45 +01:00
unknown
39751e6cff even more formatting fixes 2022-02-01 17:24:27 +01:00
unknown
ce7d759860 more formatting fixes 2022-02-01 17:17:52 +01:00
Gábor Marinov
09f40f15ad
formatting changes 2022-02-01 16:57:18 +01:00
Gábor Marinov
d48eb8d047
formatting changes 2022-02-01 16:54:38 +01:00
pypebot
708fc4774f
[Automated] Merged release main into develop 2022-02-01 12:55:42 +01:00
OpenPype
c49c9ef26e [Automated] Release 2022-02-01 11:50:35 +00:00
Petr Kalis
56c51e4667
Merge pull request #2613 from pypeclub/bugfix/safer_task_selection_for_webpublishes
Fix - safer pulling of task name for webpublishing from PS
2022-02-01 12:45:33 +01:00
pypebot
897542d9b7
[Automated] Merged main into develop 2022-02-01 12:44:01 +01:00
OpenPype
1b6b39051f [Automated] Bump version 2022-02-01 11:43:50 +00:00
pypebot
c4eecfa88c
[Automated] Merged develop into main 2022-02-01 12:37:46 +01:00
Milan Kolar
d2e0ddabb1
Merge pull request #2619 from pypeclub/release/3.8.0 2022-02-01 12:37:19 +01:00
Ondřej Samohel
988fd03ea0
Merge pull request #2618 from pypeclub/hotfix/oiiotool-path-on-windows
hotfix: OIIO tool path - add extension on windows
2022-02-01 11:08:59 +01:00
Ondrej Samohel
304d855103
add extension on windows 2022-02-01 10:57:15 +01:00
Jakub Trllo
7d8b36ac7d
Merge pull request #2504 from pypeclub/bugfix/OP-2347_Maya-Workdirs--Workspacemel-get-nested-down-when-switching-via-Work-Files-tool
Workfiles Tool can handle when workfile is not created directly in workdir path
2022-02-01 10:57:02 +01:00
Jakub Trllo
d5e9670cda
Merge pull request #2610 from BigRoy/settings_typos
Cosmetics: Refactor `hightlight` and `overriden` typos
2022-02-01 10:17:05 +01:00
Roy Nieterau
88cde63aa8 Fix typo 2022-01-31 23:37:12 +01:00
Roy Nieterau
2e2d8009ae Fix common typos in openpype/website 2022-01-31 23:35:48 +01:00
Roy Nieterau
ec3b535f76
Revert string value for M_OVERRIDDEN_KEY for backwards compatibility
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2022-01-31 23:08:41 +01:00
Milan Kolar
0680e1b3f1
Merge pull request #2612 from pypeclub/documentation/typo_fixes 2022-01-31 18:17:22 +01:00
Petr Kalis
ad0abfbdd0
Merge pull request #2536 from pypeclub/feature/OP-1117_Disable-workfile-autoload-in-Launcher
Launcher: Added context menu to to skip opening last workfile
2022-01-31 16:06:49 +01:00
Jakub Trllo
7835055ec5
Merge pull request #2608 from BigRoy/cosmetics2
Cosmetics: Fix some more grammar and typos in code (openpype/tools)
2022-01-31 14:53:36 +01:00
Jakub Trllo
c9a9f8d59a
Merge pull request #2615 from pypeclub/bugfix/OP-2537_Settings-Enum-may-store-empty-string
Settings: Enum does not store empty string if has single item to select
2022-01-31 14:49:01 +01:00
Jakub Trllo
602e7e04e6
Merge pull request #2609 from BigRoy/switch_dialog_bug
Scene Inventory: Fix type name for 'representation' in switch logic
2022-01-31 14:40:18 +01:00
Jakub Trllo
bdfdc38b72 Make sure current value in enum match with valid keys 2022-01-31 14:28:27 +01:00
Petr Kalis
29c4adb507 Fix - safer pulling of task name for webpublishing from PS 2022-01-31 12:55:41 +01:00
Gábor Marinov
e5ddac1101
Added two missing defaults 2022-01-31 12:24:08 +01:00
Gábor Marinov
213ee7e077
Saved json from settings instead of direct editing 2022-01-31 12:18:12 +01:00
Gábor Marinov
6c842c4f76
Update schema_project_ftrack.json
tabs -> spaces
2022-01-31 12:03:55 +01:00
murphy
f97a9a9bb4 few typos fixed 2022-01-31 11:33:59 +01:00
Petr Kalis
2a8a444ec9
Merge pull request #2591 from pypeclub/feature/webpublish_skip_version_collect
Webpublisher: Skip version collect
2022-01-31 10:48:38 +01:00
Petr Kalis
336585bbc9
Update openpype/plugins/publish/collect_scene_version.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2022-01-31 10:48:11 +01:00
Petr Kalis
69bfcd6a30
Update openpype/plugins/publish/collect_scene_version.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2022-01-31 10:45:18 +01:00
Roy Nieterau
f9209be519 Refactor overriden -> overridden + hightlight -> highlight 2022-01-30 23:05:17 +01:00
Roy Nieterau
dab508c7ca Fix type name for 'representation' 2022-01-30 22:17:17 +01:00
Roy Nieterau
20bc784698 Fix typos/grammar mistakes. 2022-01-30 22:03:34 +01:00
Roy Nieterau
af652e0d42 Remove double 'project' in label 2022-01-30 21:32:44 +01:00
Gábor Marinov
5c22c45fa2
Adding more defaults 2022-01-29 21:00:20 +01:00
Gábor Marinov
4b54c094e0
Removed checkbox from IntegrateFtrackInstance 2022-01-29 20:03:17 +01:00
pypebot
e41e137dea
[Automated] Merged main into develop 2022-01-29 04:38:51 +01:00
OpenPype
a58865363f [Automated] Bump version 2022-01-29 03:38:41 +00:00
pypebot
13285eebb4
[Automated] Merged develop into main 2022-01-29 04:31:54 +01:00
Ondřej Samohel
c6eb14ab62
Merge pull request #2066 from simonebarbieri/feature/unreal-load_layout
Unreal: JSON Layout Loading support
2022-01-28 13:55:33 +01:00
Gábor Marinov
2a00a6fd47
Added family_mapping defaults 2022-01-28 00:22:49 +01:00