Commit graph

5 commits

Author SHA1 Message Date
Roy Nieterau
1a1c9f3014 Merge remote-tracking branch 'upstream/develop' into fusion_integration_v2
# Conflicts:
#	openpype/hosts/fusion/__init__.py
#	openpype/hosts/fusion/deploy/MenuScripts/openpype_menu.py
#	openpype/hosts/fusion/scripts/fusion_switch_shot.py
2022-09-13 23:26:24 +02: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
Roy Nieterau
51ef4ce4e5 Move Comp scripts to an OpenPype submenu to clarify those are OpenPype scripts 2022-02-22 21:11:40 +01:00
Roy Nieterau
1b40d5102f Fix hound issues 2022-02-20 22:22:50 +01:00
Roy Nieterau
e8d6f1d9e9 Pull Fusion integration from colorbleed 2022-02-20 22:02:56 +01:00