diff --git a/openpype/hosts/fusion/api/menu.py b/openpype/hosts/fusion/api/menu.py index 11b6c2e273d..6234322d7f5 100644 --- a/openpype/hosts/fusion/api/menu.py +++ b/openpype/hosts/fusion/api/menu.py @@ -59,7 +59,7 @@ def __init__(self, *args, **kwargs): create_btn = QtWidgets.QPushButton("Create...", self) publish_btn = QtWidgets.QPushButton("Publish...", self) load_btn = QtWidgets.QPushButton("Load...", self) - inventory_btn = QtWidgets.QPushButton("Inventory...", self) + manager_btn = QtWidgets.QPushButton("Manage...", self) libload_btn = QtWidgets.QPushButton("Library...", self) rendermode_btn = QtWidgets.QPushButton("Set render mode...", self) duplicate_with_inputs_btn = QtWidgets.QPushButton( @@ -76,7 +76,7 @@ def __init__(self, *args, **kwargs): layout.addWidget(create_btn) layout.addWidget(publish_btn) layout.addWidget(load_btn) - layout.addWidget(inventory_btn) + layout.addWidget(manager_btn) layout.addWidget(Spacer(15, self)) @@ -97,7 +97,7 @@ def __init__(self, *args, **kwargs): create_btn.clicked.connect(self.on_create_clicked) publish_btn.clicked.connect(self.on_publish_clicked) load_btn.clicked.connect(self.on_load_clicked) - inventory_btn.clicked.connect(self.on_inventory_clicked) + manager_btn.clicked.connect(self.on_manager_clicked) libload_btn.clicked.connect(self.on_libload_clicked) rendermode_btn.clicked.connect(self.on_rendernode_clicked) duplicate_with_inputs_btn.clicked.connect( @@ -120,8 +120,8 @@ def on_load_clicked(self): print("Clicked Load") host_tools.show_loader(use_context=True) - def on_inventory_clicked(self): - print("Clicked Inventory") + def on_manager_clicked(self): + print("Clicked Manager") host_tools.show_scene_inventory() def on_libload_clicked(self): diff --git a/openpype/hosts/fusion/plugins/load/actions.py b/openpype/hosts/fusion/plugins/load/actions.py index e1cdc6a41b4..6af99e4c562 100644 --- a/openpype/hosts/fusion/plugins/load/actions.py +++ b/openpype/hosts/fusion/plugins/load/actions.py @@ -12,7 +12,8 @@ class FusionSetFrameRangeLoader(api.Loader): "camera", "imagesequence", "yeticache", - "pointcache"] + "pointcache", + "render"] representations = ["*"] label = "Set frame range" @@ -45,7 +46,8 @@ class FusionSetFrameRangeWithHandlesLoader(api.Loader): "camera", "imagesequence", "yeticache", - "pointcache"] + "pointcache", + "render"] representations = ["*"] label = "Set frame range (with handles)" diff --git a/openpype/hosts/fusion/plugins/load/load_sequence.py b/openpype/hosts/fusion/plugins/load/load_sequence.py index 667d50ed45a..ea118585bf0 100644 --- a/openpype/hosts/fusion/plugins/load/load_sequence.py +++ b/openpype/hosts/fusion/plugins/load/load_sequence.py @@ -120,7 +120,7 @@ def loader_shift(loader, frame, relative=True): class FusionLoadSequence(api.Loader): """Load image sequence into Fusion""" - families = ["imagesequence", "review"] + families = ["imagesequence", "review", "render"] representations = ["*"] label = "Load sequence" @@ -204,7 +204,7 @@ def update(self, container, representation): assert tool.ID == "Loader", "Must be Loader" comp = tool.Comp() - root = api.get_representation_path(representation) + root = os.path.dirname(api.get_representation_path(representation)) path = self._get_first_image(root) # Get start frame from version data diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index 317ed061b49..bfa1bd5cdc9 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -690,15 +690,31 @@ "OPENPYPE_LOG_NO_COLORS": "Yes" }, "variants": { - "16": { - "enabled": true, - "variant_label": "16", + "17": { "use_python_2": false, "executables": { + "windows": [ + "C:\\Program Files\\Blackmagic Design\\Fusion 17\\Fusion.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { "windows": [], "darwin": [], "linux": [] }, + "environment": {} + }, + "16": { + "use_python_2": false, + "executables": { + "windows": [ + "C:\\Program Files\\Blackmagic Design\\Fusion 16\\Fusion.exe" + ], + "darwin": [], + "linux": [] + }, "arguments": { "windows": [], "darwin": [], @@ -707,8 +723,6 @@ "environment": {} }, "9": { - "enabled": true, - "variant_label": "9", "use_python_2": false, "executables": { "windows": [ diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json index 58f37fa99bb..f62b4395361 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json @@ -20,24 +20,20 @@ "type": "raw-json" }, { - "type": "dict", + "type": "dict-modifiable", "key": "variants", - "children": [ - { - "type": "schema_template", - "name": "template_host_variant", - "template_data": [ - { - "app_variant_label": "16", - "app_variant": "16" - }, - { - "app_variant_label": "9", - "app_variant": "9" - } - ] - } - ] + "collapsible_key": true, + "use_label_wrap": false, + "object_type": { + "type": "dict", + "collapsible": true, + "children": [ + { + "type": "schema_template", + "name": "template_host_variant_items" + } + ] + } } ] -} +} \ No newline at end of file