[Bf-blender-cvs] [a751c7b2d18] hair_guides_grooming: Show scalp region buttons in separate panel.

[Lukas Tönne]

Commit: a751c7b2d1833b18e20a71368bdb346e1ddd3a51
Author: Lukas Tönne
Date:   Tue May 29 07:41:24 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rBa751c7b2d1833b18e20a71368bdb346e1ddd3a51

Show scalp region buttons in separate panel.

===================================================================

M	release/scripts/startup/bl_ui/properties_data_groom.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_data_groom.py b/release/scripts/startup/bl_ui/properties_data_groom.py
index ccb9b51497f..9d96bed500b 100644
--- a/release/scripts/startup/bl_ui/properties_data_groom.py
+++ b/release/scripts/startup/bl_ui/properties_data_groom.py
@@ -31,10 +31,7 @@ class GROOM_UL_bundles(bpy.types.UIList):
             row = layout.row(align=True)
             if not bundle.is_bound:
                 row.label(icon='ERROR')
-            if groom.scalp_object:
-                row.prop_search(bundle, "scalp_facemap", groom.scalp_object, "face_maps", text="")
-            else:
-                row.prop(bundle, "scalp_facemap", text="")
+            row.label(bundle.scalp_facemap)
 
         elif self.layout_type == 'GRID':
             layout.alignment = 'CENTER'
@@ -74,19 +71,7 @@ class DATA_PT_groom(DataButtonsPanel, Panel):
 
     def draw(self, context):
         layout = self.layout
-
         groom = context.groom
-        bundle = context.groom.bundles.active
-
-        layout.template_list("GROOM_UL_bundles", "bundles",
-                             groom, "bundles",
-                             groom.bundles, "active_index")
-        if bundle:
-            col = layout.column()
-            col.label("Region:")
-            col.prop(bundle, "guides_count")
-
-            layout.separator()
 
         split = layout.split()
 
@@ -99,6 +84,29 @@ class DATA_PT_groom(DataButtonsPanel, Panel):
         col.prop(groom, "curve_resolution", "Resolution")
 
 
+class DATA_PT_groom_regions(DataButtonsPanel, Panel):
+    bl_label = "Regions"
+
+    def draw(self, context):
+        layout = self.layout
+
+        groom = context.groom
+        bundle = context.groom.bundles.active
+
+        layout.template_list("GROOM_UL_bundles", "bundles",
+                             groom, "bundles",
+                             groom.bundles, "active_index")
+        if bundle:
+            col = layout.column()
+
+            if groom.scalp_object:
+                col.prop_search(bundle, "scalp_facemap", groom.scalp_object, "face_maps", text="")
+            else:
+                col.prop(bundle, "scalp_facemap", text="")
+
+            col.prop(bundle, "guides_count")
+
+
 class DATA_PT_groom_hair(DataButtonsPanel, Panel):
     bl_label = "Hair"
 
@@ -137,6 +145,7 @@ classes = (
     GROOM_UL_bundles,
     DATA_PT_context_groom,
     DATA_PT_groom,
+    DATA_PT_groom_regions,
     DATA_PT_groom_hair,
     DATA_PT_groom_draw_settings,
     DATA_PT_custom_props_groom,