Commit graph

19797 commits

Author SHA1 Message Date
Roy Nieterau
45391662f7 Fix merge conflict and remove fusion_switch_shot.py again 2022-03-17 12:21:12 +01:00
Roy Nieterau
4c81d1d0b2 Merge remote-tracking branch 'upstream/develop' into fusion_integration_v2
# Conflicts:
#	openpype/scripts/fusion_switch_shot.py
2022-03-17 12:20:05 +01:00
Jakub Trllo
9044be5153
Merge pull request #2899 from BigRoy/pyblish_pype_fix_message_2834
Pyblish Pype - ensure current state is correct when entering new group order
2022-03-17 09:48:41 +01:00
Roy Nieterau
3d426d1d8f Fix #2834 - ensure current state is correct when entering new group order 2022-03-17 00:14:00 +01:00
Milan Kolar
2242bb1718 Merge branch 'documentation/index_update' into develop 2022-03-16 17:48:32 +01:00
Jakub Ježek
9015dd9ce7
Merge pull request #2869 from pypeclub/feature/OP-2732_Flame-rendering-presets-from-sequence 2022-03-16 16:57:49 +01:00
Jakub Ježek
2563a7ce60
Update openpype/hosts/flame/plugins/publish/extract_subset_resources.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2022-03-16 16:36:46 +01:00
Jakub Trllo
e6b4911ab6
Merge pull request #2879 from pypeclub/enhancement/OP-2916_Nuke-Slate-DNX-profile-error
Nuke: ExtractReviewSlate can handle more codes and profiles
2022-03-16 16:04:34 +01:00
Jakub Jezek
8b3d32c5b2
global: fixing order of output resolution flow 2022-03-16 15:42:49 +01:00
Milan Kolar
819e44976c add ember light 2022-03-16 14:03:35 +01:00
Jakub Trllo
c21026b613
Merge pull request #2894 from pypeclub/bugfix/scene_inventory_load_fixes
SceneInventory: Fix import of load function
2022-03-16 11:26:38 +01:00
Jakub Trllo
f130e30a2c fix missing import of 'get_repres_contexts' 2022-03-16 10:45:11 +01:00
Jakub Trllo
256286c55f fix tooltip of buttons in scene inventory 2022-03-16 10:37:51 +01:00
Milan Kolar
30788b6d38 add overmind studios 2022-03-16 10:20:36 +01:00
Jakub Trllo
fedde965c1 pass source ffmpeg argument if available in extract review slate 2022-03-16 10:19:38 +01:00
Jakub Trllo
b0a8809cbf dnxhd is adding bitrate in case of dnxhd profile 2022-03-16 10:19:22 +01:00
Milan Kolar
8481178608 add kitsu 2022-03-16 09:57:08 +01:00
Milan Kolar
47cb270532 add integrations and users 2022-03-16 09:56:46 +01:00
Jakub Trllo
d1208cbebc
Merge pull request #2886 from pypeclub/enhancement/OP-2848_move-loader-logic-from-avalon-to-openpype
General: Move loader logic from avalon to openpype
2022-03-16 09:26:30 +01:00
pypebot
7501d86920
[Automated] Merged main into develop 2022-03-16 04:37:23 +01:00
OpenPype
0f67d46ae0 [Automated] Bump version 2022-03-16 03:37:11 +00:00
pypebot
d27f413bfd
[Automated] Merged develop into main 2022-03-16 04:30:04 +01:00
Petr Kalis
80cd590d6e
Merge pull request #2891 from pypeclub/bugfix/harmony_creator_issue
Harmony - fixed creator issue
2022-03-15 15:25:39 +01:00
Petr Kalis
372d686024 Fix - Harmony creator issue
Creator failed with 'str' object does not support item assignment
2022-03-15 14:24:36 +01:00
Jakub Trllo
4f7d99babe remove plural from de/register_loader_plugins_path 2022-03-15 14:15:35 +01:00
Jakub Trllo
348ccc68b1 Merge branch 'develop' into enhancement/OP-2848_move-loader-logic-from-avalon-to-openpype 2022-03-15 11:45:28 +01:00
Jakub Trllo
5b835d87e7 renamed 'load_representation' to 'load_container' 2022-03-15 11:40:59 +01:00
Jakub Jezek
f4ece8fd5e
flame: removing testing code 2022-03-15 11:17:31 +01:00
Jakub Trllo
d1050bd7ee
Merge pull request #2889 from pypeclub/enhancement/OP-2857_create-color-definitions-for-asset-icons-etc-avalonstylecolors
General: Reduce style usage to OpenPype repository
2022-03-15 11:15:09 +01:00
Jakub Trllo
4323974011 remove debug prints 2022-03-15 11:12:39 +01:00
Jakub Trllo
10333be883 remove asset document check 2022-03-15 10:55:40 +01:00
Jakub Trllo
001f096f4e fix deprecated font color in standalone publisher 2022-03-15 10:55:27 +01:00
Jakub Trllo
8a0005e93d use default task icon in publisher 2022-03-15 10:50:00 +01:00
Jakub Trllo
58d31a11b9 implemented function to receive task icon 2022-03-15 10:49:51 +01:00
Jakub Trllo
96f55916dd remove constants 2022-03-15 10:26:07 +01:00
Jakub Trllo
c5b3098acd fix function typo 2022-03-15 10:24:12 +01:00
Jakub Trllo
16a24d03da removed unnecessary style set 2022-03-15 09:56:58 +01:00
Jakub Trllo
8f998f06e8 use openpype style on scene inventory error dialog 2022-03-14 17:24:57 +01:00
Jakub Trllo
b48460d579 added function for getting a project icon 2022-03-14 17:17:33 +01:00
Jakub Trllo
2b062e98a0 added icon option for projects 2022-03-14 16:51:37 +01:00
Jakub Trllo
e1dd07c936 remove backwards compatibility of 'application' context function 2022-03-14 16:40:32 +01:00
Jakub Trllo
4f8129acfa move spinner svg into openpype 2022-03-14 16:40:05 +01:00
Jakub Trllo
cd1e764da6 cleanup 2022-03-14 16:19:08 +01:00
Jakub Trllo
bf3b9407cb remove avalon style from maya look assigner 2022-03-14 16:18:23 +01:00
Jakub Trllo
7c63ef68df change asset colorchange entity icon color 2022-03-14 15:45:03 +01:00
Jakub Trllo
9bbaf42a3b use functions for colors in tools 2022-03-14 15:26:08 +01:00
Jakub Trllo
8d81a91c1c use openpype style in delete old versions 2022-03-14 15:24:56 +01:00
Jakub Trllo
239badf4d3 added functions to get colors from style data 2022-03-14 15:24:40 +01:00
Jakub Trllo
d5c35d1873 use color hex instead of constans in nuke plugins 2022-03-14 15:20:20 +01:00
Jakub Trllo
105d794358 fix typo 2022-03-14 14:04:37 +01:00