From da1bb3fad53f3dbe020e1294a6f115618ea1eb2c Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:28:20 +0200 Subject: [PATCH 1/5] pointcache does not append attr definitions to base list but to new list --- .../plugins/create/create_animation_pointcache.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py b/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py index ea4cdb57fe..521dc1a681 100644 --- a/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py @@ -99,8 +99,8 @@ def read_instance_node(self, node): return node_data def get_instance_attr_defs(self): - defs = super(CreateAnimation, self).get_instance_attr_defs() - defs += _get_animation_attr_defs(self) + defs = list(super().get_instance_attr_defs()) + defs.extend(_get_animation_attr_defs(self)) return defs @@ -123,8 +123,8 @@ def read_instance_node(self, node): return node_data def get_instance_attr_defs(self): - defs = super(CreatePointCache, self).get_instance_attr_defs() - defs += _get_animation_attr_defs(self) + defs = list(super().get_instance_attr_defs()) + defs.extend(_get_animation_attr_defs(self)) return defs def create(self, product_name, instance_data, pre_create_data): From 820bb7318e51248237b0352e63c79e869faabf89 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:48:35 +0200 Subject: [PATCH 2/5] don't call 'super' in 'get_instance_attr_defs' --- .../plugins/create/create_animation_pointcache.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py b/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py index 521dc1a681..aa9b61b46e 100644 --- a/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py @@ -99,9 +99,7 @@ def read_instance_node(self, node): return node_data def get_instance_attr_defs(self): - defs = list(super().get_instance_attr_defs()) - defs.extend(_get_animation_attr_defs(self)) - return defs + return _get_animation_attr_defs(self) class CreatePointCache(plugin.MayaCreator): @@ -123,9 +121,7 @@ def read_instance_node(self, node): return node_data def get_instance_attr_defs(self): - defs = list(super().get_instance_attr_defs()) - defs.extend(_get_animation_attr_defs(self)) - return defs + return _get_animation_attr_defs(self) def create(self, product_name, instance_data, pre_create_data): instance = super(CreatePointCache, self).create( From 5a74d5c986084ddd7537648b9e6784295ed901d0 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:48:52 +0200 Subject: [PATCH 3/5] do not pass self to the function --- .../ayon_maya/plugins/create/create_animation_pointcache.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py b/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py index aa9b61b46e..d98b0dd5fa 100644 --- a/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py @@ -8,7 +8,7 @@ ) -def _get_animation_attr_defs(cls): +def _get_animation_attr_defs(): """Get Animation generic definitions.""" defs = lib.collect_animation_defs() defs.extend( @@ -99,7 +99,7 @@ def read_instance_node(self, node): return node_data def get_instance_attr_defs(self): - return _get_animation_attr_defs(self) + return _get_animation_attr_defs() class CreatePointCache(plugin.MayaCreator): @@ -121,7 +121,7 @@ def read_instance_node(self, node): return node_data def get_instance_attr_defs(self): - return _get_animation_attr_defs(self) + return _get_animation_attr_defs() def create(self, product_name, instance_data, pre_create_data): instance = super(CreatePointCache, self).create( From fca9eaa4238cc440009193796acff83c1c5c705f Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:49:02 +0200 Subject: [PATCH 4/5] fix pre create attributes in look --- .../maya/client/ayon_maya/plugins/create/create_look.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_addon/maya/client/ayon_maya/plugins/create/create_look.py b/server_addon/maya/client/ayon_maya/plugins/create/create_look.py index 1f90d18607..3e1ec103ba 100644 --- a/server_addon/maya/client/ayon_maya/plugins/create/create_look.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_look.py @@ -42,6 +42,6 @@ def get_instance_attr_defs(self): def get_pre_create_attr_defs(self): # Show same attributes on create but include use selection - defs = super(CreateLook, self).get_pre_create_attr_defs() + defs = list(super().get_pre_create_attr_defs()) defs.extend(self.get_instance_attr_defs()) return defs From 70b5ac77984fd34dc3eafd797b821c2b60667d96 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:49:23 +0200 Subject: [PATCH 5/5] bump maya version to '0.2.3' --- server_addon/maya/client/ayon_maya/version.py | 2 +- server_addon/maya/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server_addon/maya/client/ayon_maya/version.py b/server_addon/maya/client/ayon_maya/version.py index 1655067287..fcad19941f 100644 --- a/server_addon/maya/client/ayon_maya/version.py +++ b/server_addon/maya/client/ayon_maya/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring AYON addon 'maya' version.""" -__version__ = "0.2.2" +__version__ = "0.2.3" diff --git a/server_addon/maya/package.py b/server_addon/maya/package.py index 627e824413..e0fc2ee5cf 100644 --- a/server_addon/maya/package.py +++ b/server_addon/maya/package.py @@ -1,6 +1,6 @@ name = "maya" title = "Maya" -version = "0.2.2" +version = "0.2.3" client_dir = "ayon_maya" ayon_required_addons = {