From ea831982c1f5dad098a6439af8b0889b4361c91a Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 14 Jul 2021 17:52:12 +0200 Subject: [PATCH] changed args order on CreatedInstance --- openpype/pipeline/creator_plugins.py | 11 ++++++++--- openpype/tools/new_publisher/control.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/openpype/pipeline/creator_plugins.py b/openpype/pipeline/creator_plugins.py index bda4155744..66eff35c5a 100644 --- a/openpype/pipeline/creator_plugins.py +++ b/openpype/pipeline/creator_plugins.py @@ -12,6 +12,7 @@ from abc import ( import six from .lib import UnknownDef +import avalon.api from openpype.lib import get_subset_name @@ -221,9 +222,11 @@ class CreatedInstance: already existing instance. """ def __init__( - self, host, creator, family, subset_name, data=None, + self, family, subset_name, data=None, creator=None, host=None, attr_plugins=None, new=True ): + if not host: + host = avalon.api.registered_host() self.host = host self.creator = creator @@ -347,7 +350,9 @@ class CreatedInstance: self.data = data @classmethod - def from_existing(cls, host, creator, instance_data, attr_plugins=None): + def from_existing( + cls, instance_data, creator=None, host=None, attr_plugins=None + ): """Convert instance data from workfile to CreatedInstance.""" instance_data = copy.deepcopy(instance_data) @@ -355,7 +360,7 @@ class CreatedInstance: subset_name = instance_data.get("subset", None) return cls( - host, creator, family, subset_name, instance_data, + family, subset_name, instance_data, creator, host, attr_plugins, new=False ) diff --git a/openpype/tools/new_publisher/control.py b/openpype/tools/new_publisher/control.py index 75356bb5a7..acd56fde92 100644 --- a/openpype/tools/new_publisher/control.py +++ b/openpype/tools/new_publisher/control.py @@ -129,7 +129,7 @@ class PublisherController: family ) instance = CreatedInstance.from_existing( - self.host, creator, instance_data, attr_plugins + instance_data, creator, self.host, attr_plugins ) instances.append(instance)