From 15c7978e2819afc1bcc2e2b49e3b579f84d6607f Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Fri, 23 Jun 2023 07:38:35 +0100 Subject: [PATCH] Revert "Adding support for excluded families." This reverts commit 40cf531cb12bf6a042d4535b08bc3139ed415cac. --- openpype/hosts/maya/plugins/load/actions.py | 17 +++++++++++++++-- openpype/pipeline/load/plugins.py | 17 +---------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/openpype/hosts/maya/plugins/load/actions.py b/openpype/hosts/maya/plugins/load/actions.py index 57d1039245..4855f3eed0 100644 --- a/openpype/hosts/maya/plugins/load/actions.py +++ b/openpype/hosts/maya/plugins/load/actions.py @@ -93,8 +93,21 @@ class ImportMayaLoader(load.LoaderPlugin): """ representations = ["ma", "mb", "obj"] - families = ["*"] - excluded_families = ["xgen"] + families = [ + "model", + "pointcache", + "proxyAbc", + "animation", + "mayaAscii", + "mayaScene", + "setdress", + "layout", + "camera", + "rig", + "camerarig", + "staticMesh", + "workfile" + ] label = "Import" order = 10 diff --git a/openpype/pipeline/load/plugins.py b/openpype/pipeline/load/plugins.py index 433d7f671a..e380d65bbe 100644 --- a/openpype/pipeline/load/plugins.py +++ b/openpype/pipeline/load/plugins.py @@ -28,7 +28,6 @@ class LoaderPlugin(list): """ families = [] - excluded_families = [] representations = [] extensions = {"*"} order = 0 @@ -160,10 +159,7 @@ class LoaderPlugin(list): return False plugin_families = set(plugin_families) - - # Return if all families are allowed and no excluded families are - # defined. - if "*" in plugin_families and not cls.excluded_families: + if "*" in plugin_families: return True subset_doc = context["subset"] @@ -179,17 +175,6 @@ class LoaderPlugin(list): if not families: return False - - # Return if there are intersections between the subsets families and - # the loaders excluded families. - if list(set(families) & set(cls.excluded_families)): - return False - - # Return if all families are allowed since excluded families have - # already been considered. - if "*" in plugin_families: - return True - return any(family in plugin_families for family in families) @classmethod