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
..
aftereffects	remove plural from de/register_loader_plugins_path	2022-03-15 14:15:35 +01:00
blender	remove plural from de/register_loader_plugins_path	2022-03-15 14:15:35 +01:00
celaction	fixed remaining imports from avalon.vendor	2022-03-07 17:49:15 +01:00
flame	Merge pull request #2869 from pypeclub/feature/OP-2732_Flame-rendering-presets-from-sequence	2022-03-16 16:57:49 +01:00
fusion	Merge remote-tracking branch 'upstream/develop' into fusion_integration_v2	2022-03-17 12:20:05 +01:00
harmony	Merge pull request #2886 from pypeclub/enhancement/OP-2848_move-loader-logic-from-avalon-to-openpype	2022-03-16 09:26:30 +01:00
hiero	remove plural from de/register_loader_plugins_path	2022-03-15 14:15:35 +01:00
houdini	remove plural from de/register_loader_plugins_path	2022-03-15 14:15:35 +01:00
maya	remove plural from de/register_loader_plugins_path	2022-03-15 14:15:35 +01:00
nuke	remove plural from de/register_loader_plugins_path	2022-03-15 14:15:35 +01:00
photoshop	remove plural from de/register_loader_plugins_path	2022-03-15 14:15:35 +01:00
resolve	remove plural from de/register_loader_plugins_path	2022-03-15 14:15:35 +01:00
standalonepublisher	moved ffprobe_streams into transcoding, seprated and renamed to get_ffprobe_streams	2022-03-11 17:55:00 +01:00
testhost	fix method name	2022-03-09 17:44:33 +01:00
traypublisher	changed icon of workfile creator	2022-02-21 19:01:25 +01:00
tvpaint	remove plural from de/register_loader_plugins_path	2022-03-15 14:15:35 +01:00
unreal	remove plural from de/register_loader_plugins_path	2022-03-15 14:15:35 +01:00
webpublisher	Merge pull request #2879 from pypeclub/enhancement/OP-2916_Nuke-Slate-DNX-profile-error	2022-03-16 16:04:34 +01:00
__init__.py	rename folder	2021-04-01 18:54:46 +02:00