From d2325587d73bc825986af3a1baba51cb4a9ce355 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Mon, 11 Jul 2022 20:32:12 +0300 Subject: Rigify: fix T99352 - generation issues when same named rig is linked. Only consider local datablocks when searching for the rig object, widget collection and widget objects themselves during generation. --- rigify/utils/widgets.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'rigify/utils/widgets.py') diff --git a/rigify/utils/widgets.py b/rigify/utils/widgets.py index e02f3387..ca207ddc 100644 --- a/rigify/utils/widgets.py +++ b/rigify/utils/widgets.py @@ -86,6 +86,9 @@ def create_widget(rig, bone_name, bone_transform_name=None, *, widget_name=None, if not obj: # Search the scene by name obj = scene.objects.get(obj_name) + if obj.library: + local_objs = [obj for obj in scene.objects if obj.name == obj_name and not obj.library] + obj = local_objs[0] if local_objs else None if obj: # Record the generated widget -- cgit v1.2.3 From 9f59c24f1f3b75550a8189bf4080cc7e19838837 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Tue, 12 Jul 2022 18:04:32 +0300 Subject: Rigify: fix exceptions when generating from scratch. --- rigify/utils/widgets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rigify/utils/widgets.py') diff --git a/rigify/utils/widgets.py b/rigify/utils/widgets.py index ca207ddc..5a16065b 100644 --- a/rigify/utils/widgets.py +++ b/rigify/utils/widgets.py @@ -86,7 +86,7 @@ def create_widget(rig, bone_name, bone_transform_name=None, *, widget_name=None, if not obj: # Search the scene by name obj = scene.objects.get(obj_name) - if obj.library: + if obj and obj.library: local_objs = [obj for obj in scene.objects if obj.name == obj_name and not obj.library] obj = local_objs[0] if local_objs else None -- cgit v1.2.3