diff options
Diffstat (limited to 'release/scripts/startup')
4 files changed, 84 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py index 89aed37f055..3b0cc2527a8 100644 --- a/release/scripts/startup/bl_ui/__init__.py +++ b/release/scripts/startup/bl_ui/__init__.py @@ -44,6 +44,7 @@ _modules = [ "properties_data_lightprobe", "properties_data_speaker", "properties_data_workspace", + "properties_hair_common", "properties_mask_common", "properties_material", "properties_material_gpencil", diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 93e789bbd19..e2a537acadd 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' @@ -1577,6 +1577,27 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): if md.rest_source == 'BIND': layout.operator("object.correctivesmooth_bind", text="Unbind" if is_bind else "Bind") + def HAIR(self, layout, ob, md): + hsys = md.hair_system + + split = layout.split() + + col = split.column() + col.label("Follicles:") + col.prop(md, "follicle_seed") + col.prop(md, "follicle_count") + col.operator("object.hair_generate_follicles", text="Generate") + + col = split.column() + + col.separator() + + col.prop(hsys, "material_slot", text="") + + col = layout.column() + col.label("Display Settings:") + draw_hair_display_settings(col, md.draw_settings) + def WEIGHTED_NORMAL(self, layout, ob, md): layout.label("Weighting Mode:") split = layout.split(align=True) 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) diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 66f15f6a8ce..febe95c5522 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -78,7 +78,6 @@ def is_not_gpencil_edit_mode(context): ) return not is_gpmode - # ********** default tools for editmode_mesh **************** |