Merge branch 'master' into xr-devxr-dev

1 files changed, 13 insertions, 3 deletions

diff --git a/rigify/ui.py b/rigify/ui.py
index 68cfd330..8b719a3f 100644
--- a/rigify/ui.py
+++ b/rigify/ui.py
@@ -137,10 +137,20 @@ class DATA_PT_rigify_advanced(bpy.types.Panel):
         armature_id_store = context.object.data
 
         col = layout.column()
-        col.row().prop(armature_id_store, "rigify_target_rig", text="Target Rig")
-        col.row().prop(armature_id_store, "rigify_rig_ui", text="Rig UI Script")
+
+        row = col.row()
+        row.active = not armature_id_store.rigify_target_rig
+        row.prop(armature_id_store, "rigify_rig_basename", text="Rig Name")
+
+        col.separator()
+
+        col2 = col.box().column()
+        col2.label(text="Overwrite Existing:")
+        col2.row().prop(armature_id_store, "rigify_target_rig", text="Target Rig")
+        col2.row().prop(armature_id_store, "rigify_rig_ui", text="Rig UI Script")
+        col2.row().prop(armature_id_store, "rigify_widgets_collection")
+
         col.separator()
-        col.row().prop(armature_id_store, "rigify_widgets_collection")
         col.row().prop(armature_id_store, "rigify_force_widget_update")
         col.row().prop(armature_id_store, "rigify_mirror_widgets")
         col.separator()