From 3950b499b014a54845b701779f8fde90945ed59b Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 1 Oct 2021 19:45:35 +0200 Subject: [PATCH] simplified creators --- openpype/hosts/testhost/plugins/create/test_creator_1.py | 9 +++++---- openpype/hosts/testhost/plugins/create/test_creator_2.py | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/testhost/plugins/create/test_creator_1.py b/openpype/hosts/testhost/plugins/create/test_creator_1.py index 1b4b944824..a7555ac89c 100644 --- a/openpype/hosts/testhost/plugins/create/test_creator_1.py +++ b/openpype/hosts/testhost/plugins/create/test_creator_1.py @@ -17,20 +17,21 @@ class TestCreatorOne(Creator): def collect_instances(self, attr_plugins): for instance_data in pipeline.list_instances(): + instance = None creator_id = instance_data.get("creator_identifier") if creator_id is not None: if creator_id == self.identifier: - subset_name = instance_data["subset"] - instance = CreatedInstance( - self.family, subset_name, instance_data, self + instance = CreatedInstance.from_existing( + instance_data, self, attr_plugins ) - self._add_instance_to_context(instance) elif instance_data["family"] == self.identifier: instance_data["creator_identifier"] = self.identifier instance = CreatedInstance.from_existing( instance_data, self, attr_plugins ) + + if instance is not None: self._add_instance_to_context(instance) def update_instances(self, update_list): diff --git a/openpype/hosts/testhost/plugins/create/test_creator_2.py b/openpype/hosts/testhost/plugins/create/test_creator_2.py index b311e12a3e..4017d74a08 100644 --- a/openpype/hosts/testhost/plugins/create/test_creator_2.py +++ b/openpype/hosts/testhost/plugins/create/test_creator_2.py @@ -22,20 +22,21 @@ class TestCreatorTwo(Creator): def collect_instances(self, attr_plugins): for instance_data in pipeline.list_instances(): + instance = None creator_id = instance_data.get("creator_identifier") if creator_id is not None: if creator_id == self.identifier: - subset_name = instance_data["subset"] - instance = CreatedInstance( - self.family, subset_name, instance_data, self + instance = CreatedInstance.from_existing( + instance_data, self, attr_plugins ) - self._add_instance_to_context(instance) elif instance_data["family"] == self.identifier: instance_data["creator_identifier"] = self.identifier instance = CreatedInstance.from_existing( instance_data, self, attr_plugins ) + + if instance is not None: self._add_instance_to_context(instance) def update_instances(self, update_list):