From 03f48830bc1c3b99938156e3ca4d03ed966bab9d Mon Sep 17 00:00:00 2001 From: "clement.hector" Date: Tue, 18 Jan 2022 13:23:38 +0100 Subject: [PATCH 1/3] fix subset name --- .../hosts/photoshop/plugins/create/create_image.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/openpype/hosts/photoshop/plugins/create/create_image.py b/openpype/hosts/photoshop/plugins/create/create_image.py index cf41bb4020..afcfd599c8 100644 --- a/openpype/hosts/photoshop/plugins/create/create_image.py +++ b/openpype/hosts/photoshop/plugins/create/create_image.py @@ -17,9 +17,7 @@ class CreateImage(openpype.api.Creator): create_group = False stub = photoshop.stub() - useSelection = False if (self.options or {}).get("useSelection"): - useSelection = True multiple_instances = False selection = stub.get_selected_layers() self.log.info("selection {}".format(selection)) @@ -82,19 +80,13 @@ class CreateImage(openpype.api.Creator): group.name = group.name.replace(stub.PUBLISH_ICON, ''). \ replace(stub.LOADED_ICON, '') - if useSelection: - subset_name = self.data["subset"] + group.name - else: - # use value provided by user from Creator - subset_name = self.data["subset"] - if group.long_name: for directory in group.long_name[::-1]: name = directory.replace(stub.PUBLISH_ICON, '').\ replace(stub.LOADED_ICON, '') long_names.append(name) - self.data.update({"subset": subset_name}) + self.data.update({"subset": self.data["subset"]}) self.data.update({"uuid": str(group.id)}) self.data.update({"long_name": "_".join(long_names)}) stub.imprint(group, self.data) From 59e87ef79634f8e9ee1b167f1f7b19e5d0ee14ed Mon Sep 17 00:00:00 2001 From: "clement.hector" Date: Tue, 18 Jan 2022 14:07:16 +0100 Subject: [PATCH 2/3] add group name in case of multi subset creation --- openpype/hosts/photoshop/plugins/create/create_image.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/photoshop/plugins/create/create_image.py b/openpype/hosts/photoshop/plugins/create/create_image.py index afcfd599c8..b36b0d76be 100644 --- a/openpype/hosts/photoshop/plugins/create/create_image.py +++ b/openpype/hosts/photoshop/plugins/create/create_image.py @@ -75,18 +75,23 @@ class CreateImage(openpype.api.Creator): group = stub.group_selected_layers(layer.name) groups.append(group) + creator_subset_name = self.data["subset"] for group in groups: long_names = [] group.name = group.name.replace(stub.PUBLISH_ICON, ''). \ replace(stub.LOADED_ICON, '') + subset_name = creator_subset_name + if len(groups) > 1: + subset_name += group.name.title().replace(" ", "") + if group.long_name: for directory in group.long_name[::-1]: name = directory.replace(stub.PUBLISH_ICON, '').\ replace(stub.LOADED_ICON, '') long_names.append(name) - self.data.update({"subset": self.data["subset"]}) + self.data.update({"subset": subset_name}) self.data.update({"uuid": str(group.id)}) self.data.update({"long_name": "_".join(long_names)}) stub.imprint(group, self.data) From f9daff0379de4750d9067e04176513aaa5e918ba Mon Sep 17 00:00:00 2001 From: "clement.hector" Date: Tue, 18 Jan 2022 14:22:21 +0100 Subject: [PATCH 3/3] create with no "use selection" create empty subset group --- openpype/hosts/photoshop/plugins/create/create_image.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openpype/hosts/photoshop/plugins/create/create_image.py b/openpype/hosts/photoshop/plugins/create/create_image.py index b36b0d76be..344a53f47e 100644 --- a/openpype/hosts/photoshop/plugins/create/create_image.py +++ b/openpype/hosts/photoshop/plugins/create/create_image.py @@ -62,8 +62,7 @@ class CreateImage(openpype.api.Creator): # No selection creates an empty group. create_group = True else: - stub.select_layers(stub.get_layers()) - group = stub.group_selected_layers(self.name) + group = stub.create_group(self.name) groups.append(group) if create_group: