fix: relative imports from custom rigs external folder

Author: eigen-value

__init__.py

@@ -126,16 +126,16 @@ def update_external_rigs(self, context):
 
         custom_rigs_folder = bpy.context.user_preferences.addons['rigify'].preferences.custom_rigs_folder
 
+        if custom_rigs_folder == "":
+            rig_lists.rigs_dict['external'] = {}
+
         if custom_rigs_folder not in sys.path:
             sys.path.append(bpy.context.user_preferences.addons['rigify'].preferences.custom_rigs_folder)
 
-        external_rigs_dict = rig_lists.get_external_rigs()
-        if external_rigs_dict:
-
-            rig_lists.rigs_dict['external'] = external_rigs_dict
-
+        rig_lists.get_external_rigs()
+        if rig_lists.rigs_dict['external']:
             # Add external rig parameters
-            for rig in external_rigs_dict['rig_list']:
+            for rig in rig_lists.rigs_dict['external']['rig_list']:
                 r = utils.get_rig_type(rig, custom_rigs_folder)
                 try:
                     r.add_parameters(RigifyParameters)
@@ -387,6 +387,7 @@ def update_mode(self, context):
 
     external_rigs_folder = bpy.context.user_preferences.addons['rigify'].preferences.custom_rigs_folder
     if external_rigs_folder and not 'external' in rig_lists.rigs_dict:
+        #force update on reload
         bpy.context.user_preferences.addons['rigify'].preferences.custom_rigs_folder = external_rigs_folder
 
 

rig_lists.py

@@ -80,9 +80,11 @@ def get_rig_list(path, mode='relative'):
             t = f[:-3]
             if mode == 'relative':
                 module_name = os.path.join(path, t).replace(os.sep, ".")
+                rig = utils.get_rig_type(module_name, base_path=base_path)
             else:
-                module_name = t
-            rig = utils.get_rig_type(module_name, base_path=base_path)
+                external_folder = bpy.context.user_preferences.addons['rigify'].preferences.custom_rigs_folder
+                module_name = os.path.join(path, t).replace(external_folder, '').replace(os.sep, ".")
+                rig = utils.get_rig_type(module_name, base_path=external_folder)
             if hasattr(rig, "Rig"):
                 rigs += [t]
             if hasattr(rig, 'IMPLEMENTATION') and rig.IMPLEMENTATION:
@@ -116,6 +118,4 @@ def get_external_rigs():
     external_folder = bpy.context.user_preferences.addons['rigify'].preferences.custom_rigs_folder
     if external_folder:
         external_rigs_dict = get_rig_list(external_folder, mode='absolute')
-        external_rig_list = external_rigs_dict['rig_list']
-        external_implementation_rigs = external_rigs_dict['implementation_rigs']
-        return external_rigs_dict
+        rigs_dict['external'] = external_rigs_dict

ui.py

@@ -173,7 +173,7 @@ def draw(self, context):
                     a = id_store.rigify_types.add()
                     a.name = r
 
-            if 'external' in rig_lists.rigs_dict:
+            if 'external' in rig_lists.rigs_dict and rig_lists.rigs_dict['external']:
                 for r in rig_lists.rigs_dict['external']['rig_list']:
                     if collection_name == "All":
                         a = id_store.rigify_types.add()

utils.py

@@ -548,6 +548,41 @@ def create_sphere_widget(rig, bone_name, bone_transform_name=None):
         mesh.update()
 
 
+def create_circle_polygon(number_verts, axis, radius=1.0, head_tail=0.0):
+    """ Creates a basic circle around of an axis selected.
+        number_verts: number of vertices of the poligon
+        axis: axis normal to the circle
+        radius: the radius of the circle
+        head_tail: where along the length of the bone the circle is (0.0=head, 1.0=tail)
+    """
+    verts = []
+    edges = []
+    angle = 2 * math.pi / number_verts
+    i = 0
+
+    assert(axis in 'XYZ')
+
+    while i < (number_verts):
+        a = math.cos(i * angle)
+        b = math.sin(i * angle)
+
+        if axis == 'X':
+            verts.append((head_tail, a * radius, b * radius))
+        elif axis == 'Y':
+            verts.append((a * radius, head_tail, b * radius))
+        elif axis == 'Z':
+            verts.append((a * radius, b * radius, head_tail))
+
+        if i < (number_verts - 1):
+            edges.append((i , i + 1))
+
+        i += 1
+
+    edges.append((0, number_verts - 1))
+
+    return verts, edges
+
+
 def create_limb_widget(rig, bone_name, bone_transform_name=None):
     """ Creates a basic limb widget, a line that spans the length of the
         bone, with a circle around the center.
@@ -914,8 +949,16 @@ def get_rig_type(rig_type, base_path=''):
         importlib.reload(submod)
     else:
         if '.' in rig_type:
-            rig_type = str.join(os.sep, rig_type.split('.'))
-        spec = importlib.util.spec_from_file_location(rig_type, base_path + rig_type + '.py')
+            module_subpath = str.join(os.sep, rig_type.split('.'))
+            package = rig_type.split('.')[0]
+            importlib.import_module(package)
+            for sub in rig_type.split('.')[1:]:
+                package = '.'.join([package, sub])
+                importlib.import_module(package)
+        else:
+            module_subpath = rig_type
+
+        spec = importlib.util.spec_from_file_location(rig_type, base_path + module_subpath + '.py')
         submod = importlib.util.module_from_spec(spec)
         spec.loader.exec_module(submod)
     return submod