[Bf-blender-cvs] [142112faec9] tmp_hair_curves: Add common ui draw function for hair display settings.

[Lukas Tönne]

Commit: 142112faec9f41abdd5d41ee66726ea3cf1d2755
Author: Lukas Tönne
Date:   Sat Jun 30 10:42:39 2018 +0100
Branches: tmp_hair_curves
https://developer.blender.org/rB142112faec9f41abdd5d41ee66726ea3cf1d2755

Add common ui draw function for hair display settings.

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

M	release/scripts/startup/bl_ui/__init__.py
M	release/scripts/startup/bl_ui/properties_data_modifier.py
A	release/scripts/startup/bl_ui/properties_hair_common.py

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

diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py
index da9054fb681..88424991e8a 100644
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -42,6 +42,7 @@ _modules = [
     "properties_data_lightprobe",
     "properties_data_speaker",
     "properties_data_workspace",
+    "properties_hair_common",
     "properties_mask_common",
     "properties_material",
     "properties_object",
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 5c399a1e1ac..2d95729d7f1 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -20,7 +20,7 @@
 import bpy
 from bpy.types import Panel
 from bpy.app.translations import pgettext_iface as iface_
-
+from .properties_hair_common import draw_hair_display_settings
 
 class ModifierButtonsPanel:
     bl_space_type = 'PROPERTIES'
@@ -1580,9 +1580,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.prop(hsys, "material_slot", text="")
 
         col = layout.column()
-        col.label("Drawing:")
-        ds = md.draw_settings
-        col.prop(ds, "follicle_mode", expand=True)
+        col.label("Display Settings:")
+        draw_hair_display_settings(col, md.draw_settings)
 
 
 classes = (
diff --git a/release/scripts/startup/bl_ui/properties_hair_common.py b/release/scripts/startup/bl_ui/properties_hair_common.py
new file mode 100644
index 00000000000..4ebfa464923
--- /dev/null
+++ b/release/scripts/startup/bl_ui/properties_hair_common.py
@@ -0,0 +1,61 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8-80 compliant>
+
+import bpy
+
+
+def draw_hair_display_settings(layout, settings):
+    col = layout.column(align=True)
+    col.label("Follicles:")
+    col.prop(settings, "follicle_mode", expand=True)
+
+    col = layout.column(align=True)
+    col.label("Guide Curves:")
+    col.prop(settings, "guide_mode", expand=True)
+
+    layout.prop(settings, "shape")
+
+    col = layout.column(align=True)
+    col.prop(settings, "root_radius")
+    col.prop(settings, "tip_radius")
+
+    col = layout.column()
+    col.prop(settings, "radius_scale")
+    col.prop(settings, "use_close_tip")
+
+
+class HAIR_PT_display_settings:
+    # subclasses must define...
+    # ~ bl_space_type = 'PROPERTIES'
+    # ~ bl_region_type = 'WINDOW'
+    bl_label = "Hair Display Settings"
+
+    def draw(self, context):
+        settings = context.draw_hair_display_settings
+        draw_hair_display_settings(self.layout, hair_display_settings)
+
+
+classes = (
+)
+
+if __name__ == "__main__":  # only for live edit.
+    from bpy.utils import register_class
+    for cls in classes:
+        register_class(cls)