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
..
__init__.py	fusion: adding reset resolution	2022-02-20 22:08:29 +01:00
lib.py	Merge remote-tracking branch 'upstream/develop' into fusion_integration_v2	2022-03-17 12:20:05 +01:00
menu.py	Fix typo + wrong label	2022-02-22 21:02:43 +01:00
pipeline.py	Merge remote-tracking branch 'upstream/develop' into fusion_integration_v2	2022-03-17 12:20:05 +01:00
workio.py	moved fusion implementation from avalon to openpype	2022-02-14 12:23:36 +01:00