diff options
Diffstat (limited to 'release/scripts')
| -rw-r--r-- | release/scripts/startup/bl_ui/__init__.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 11 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_hair_common.py (renamed from release/scripts/startup/bl_ui/properties_hair.py) | 43 |
3 files changed, 38 insertions, 18 deletions
diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py index b63ccabfdb6..e91f3727f20 100644 --- a/release/scripts/startup/bl_ui/__init__.py +++ b/release/scripts/startup/bl_ui/__init__.py @@ -42,7 +42,7 @@ _modules = [ "properties_data_lightprobe", "properties_data_speaker", "properties_data_workspace", - "properties_hair", + "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 b6deaa39d9e..cd0617d8f26 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' @@ -1562,7 +1562,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): if md.rest_source == 'BIND': layout.operator("object.correctivesmooth_bind", text="Unbind" if is_bind else "Bind") - def FUR(self, layout, ob, md): + def HAIR(self, layout, ob, md): hsys = md.hair_system split = layout.split() @@ -1571,7 +1571,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col.label("Follicles:") col.prop(md, "follicle_seed") col.prop(md, "follicle_count") - col.operator("object.fur_generate_follicles", text="Generate") + col.operator("object.hair_generate_follicles", text="Generate") col = split.column() @@ -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.py b/release/scripts/startup/bl_ui/properties_hair_common.py index 2d234bf3f94..4ebfa464923 100644 --- a/release/scripts/startup/bl_ui/properties_hair.py +++ b/release/scripts/startup/bl_ui/properties_hair_common.py @@ -16,22 +16,43 @@ # # ##### END GPL LICENSE BLOCK ##### -# <pep8 compliant> +# <pep8-80 compliant> + import bpy -from bpy.types import UIList -class HAIR_UL_groups(UIList): - def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index): - group = item - if self.layout_type in {'DEFAULT', 'COMPACT'}: - layout.prop(group, "name", text="", emboss=False, icon_value=icon) - elif self.layout_type == 'GRID': - layout.alignment = 'CENTER' - layout.label(text="", icon_value=icon) + +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 = ( - HAIR_UL_groups, ) if __name__ == "__main__": # only for live edit. |