Rig layers can now be organized into rows by the user, for nicer layout.

1 files changed, 9 insertions, 7 deletions

diff --git a/rigify/generate.py b/rigify/generate.py
index 3de8fe23..96a6d68d 100644
--- a/rigify/generate.py
+++ b/rigify/generate.py
@@ -282,12 +282,14 @@ def generate_rig(context, metarig):
         vis_layers[i] = vis_layers[i] and not (ORG_LAYER[i] or MCH_LAYER[i] or DEF_LAYER[i])
     obj.data.layers = vis_layers
 
-    # Create list of layer names
-    if len(metarig.data.rigify_props) < 1:
-        metarig.data.rigify_props.add()
-    layer_names = []
-    for i in range(28):
-        layer_names += [getattr(metarig.data.rigify_props[0], "layer_name_%s" % str(i+1).rjust(2, "0"))]
+    # Ensure the collection of layer names exists
+    for i in range(1 + len(metarig.data.rigify_layers), 29):
+        layer = metarig.data.rigify_layers.add()
+
+    # Create list of layer name/row pairs
+    layer_layout = []
+    for l in metarig.data.rigify_layers:
+        layer_layout += [(l.name, l.row)]
 
     # Generate the UI script
     if "rig_ui.py" in bpy.data.texts:
@@ -298,7 +300,7 @@ def generate_rig(context, metarig):
     script.write(UI_SLIDERS % rig_id)
     for s in ui_scripts:
         script.write("\n        " + s.replace("\n", "\n        ") + "\n")
-    script.write(layers_ui(vis_layers, layer_names))
+    script.write(layers_ui(vis_layers, layer_layout))
     script.write(UI_REGISTER)
     script.use_module = True