studio/blender-studio-tools
13
30
Fork 19
Code Issues 20 Pull Requests 3 Projects Releases 1 Activity

Brushstroke Tools: Initial Version #328

Merged
Simon Thommes merged 229 commits from SimonThommes/blender-studio-tools:brushstroke_tools-initial-version into main 2024-11-06 15:03:47 +01:00
Conversation 6 Commits 229 Files Changed 25 +2 -5
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aef3b163f3 - Show all commits

2
scripts-blender/addons/brushstroke_tools/settings.py
View File

@ -121,7 +121,7 @@ class BSBST_Settings(bpy.types.PropertyGroup):
assign_materials: bpy.props.BoolProperty(name='Assign Modifier Materials', default=True) assign_materials: bpy.props.BoolProperty(name='Assign Modifier Materials', default=True)
brushstroke_method: bpy.props.EnumProperty(default='SURFACE_FILL', update=update_brushstroke_method, brushstroke_method: bpy.props.EnumProperty(default='SURFACE_FILL', update=update_brushstroke_method,
items= [('SURFACE_FILL', 'Fill', 'Use surface fill method for new brushstroke object', 'OUTLINER_OB_FORCE_FIELD', 0),\ items= [('SURFACE_FILL', 'Fill', 'Use surface fill method for new brushstroke object', 'OUTLINER_OB_FORCE_FIELD', 0),\
('SURFACE_DRAW', 'Draw', 'Use surface draw method for new brushstroke object', 'OUTLINER_DATA_GP_LAYER', 1), ('SURFACE_DRAW', 'Draw', 'Use surface draw method for new brushstroke object', 'LINE_DATA', 1),
]) ])
style_context: bpy.props.EnumProperty(default='AUTO', style_context: bpy.props.EnumProperty(default='AUTO',
items= [('PRESET', 'Preset', 'Specify the style of the current preset used for new brushstrokes', 'SETTINGS', 0),\ items= [('PRESET', 'Preset', 'Specify the style of the current preset used for new brushstrokes', 'SETTINGS', 0),\

5
scripts-blender/addons/brushstroke_tools/ui.py
View File

@ -68,10 +68,7 @@ class BSBST_UL_brushstroke_objects(bpy.types.UIList):
if self.layout_type in {'DEFAULT', 'COMPACT'}: if self.layout_type in {'DEFAULT', 'COMPACT'}:
if context_brushstroke: if context_brushstroke:
method_icon = 'BRUSH_DATA' method_icon = 'BRUSH_DATA'
if context_brushstroke.method == 'SURFACE_FILL': method_icon = settings.bl_rna.properties['brushstroke_method'].enum_items[context_brushstroke.method].icon
method_icon = 'OUTLINER_OB_FORCE_FIELD'
elif context_brushstroke.method == 'SURFACE_DRAW':
method_icon = 'OUTLINER_DATA_GP_LAYER'
layout.prop(context_brushstroke, 'name', text='', emboss=False, icon=method_icon) layout.prop(context_brushstroke, 'name', text='', emboss=False, icon=method_icon)
else: else:
layout.label(text="", translate=False, icon_value=icon) layout.label(text="", translate=False, icon_value=icon)