studio/blender-studio-tools
13
32
Fork 19
Code Issues 22 Pull Requests 4 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 +71 -69
1 changed files with 71 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 53a3fc831f - Show all commits

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

@ -126,8 +126,16 @@ def draw_panel_ui_recursive(panel, panel_name, mod, items, display_mode, hide_pa
def draw_material_settings(layout, material, surface_object=None): def draw_material_settings(layout, material, surface_object=None):
addon_prefs = bpy.context.preferences.addons[__package__].preferences addon_prefs = bpy.context.preferences.addons[__package__].preferences
settings = bpy.context.scene.BSBST_settings
layout.prop(material, 'diffuse_color', text='Viewport Color') material_row = layout.row(align=True)
material_row.template_ID(settings, 'context_material')
material_header, material_panel = layout.panel("brushstrokes_material", default_closed=False)
material_header.label(text='Properties', icon='MATERIAL')
if material_panel:
material_panel.prop(material, 'diffuse_color', text='Viewport Color')
# draw color options # draw color options
try: try:
n1 = material.node_tree.nodes['Color Attribute'] n1 = material.node_tree.nodes['Color Attribute']
@ -137,7 +145,7 @@ def draw_material_settings(layout, material, surface_object=None):
n5 = material.node_tree.nodes['UV Map'] n5 = material.node_tree.nodes['UV Map']
n6 = material.node_tree.nodes['Color Variation'] n6 = material.node_tree.nodes['Color Variation']
box = layout.box() box = material_panel.box()
box.prop(n1, 'mute', text='Use Brush Color', invert_checkbox=True) box.prop(n1, 'mute', text='Use Brush Color', invert_checkbox=True)
if n1.mute: if n1.mute:
row = box.row(align=True) row = box.row(align=True)
@ -161,7 +169,7 @@ def draw_material_settings(layout, material, surface_object=None):
n1 = material.node_tree.nodes['Use Strength'] n1 = material.node_tree.nodes['Use Strength']
n2 = material.node_tree.nodes['Opacity'] n2 = material.node_tree.nodes['Opacity']
box = layout.box() box = material_panel.box()
box.prop(n1, 'mute', text='Use Brush Strength', invert_checkbox=True) box.prop(n1, 'mute', text='Use Brush Strength', invert_checkbox=True)
box.prop(n2.inputs[0], 'default_value', text='Opacity') box.prop(n2.inputs[0], 'default_value', text='Opacity')
except: except:
@ -172,7 +180,7 @@ def draw_material_settings(layout, material, surface_object=None):
n1 = material.node_tree.nodes['Principled BSDF'] n1 = material.node_tree.nodes['Principled BSDF']
n2 = material.node_tree.nodes['Bump'] n2 = material.node_tree.nodes['Bump']
box = layout.box() box = material_panel.box()
box.prop(n1.inputs[1], 'default_value', text='Metallic') box.prop(n1.inputs[1], 'default_value', text='Metallic')
box.prop(n1.inputs[2], 'default_value', text='Roughness') box.prop(n1.inputs[2], 'default_value', text='Roughness')
box.prop(n2, 'mute', text='Bump', invert_checkbox=True) box.prop(n2, 'mute', text='Bump', invert_checkbox=True)
@ -189,7 +197,7 @@ def draw_material_settings(layout, material, surface_object=None):
n2 = material.node_tree.nodes['Translucency Strength'] n2 = material.node_tree.nodes['Translucency Strength']
n3 = material.node_tree.nodes['Translucency Tint'] n3 = material.node_tree.nodes['Translucency Tint']
box = layout.box() box = material_panel.box()
box.prop(n1, 'mute', text='Translucency', invert_checkbox=True) box.prop(n1, 'mute', text='Translucency', invert_checkbox=True)
box.prop(n2.inputs[0], 'default_value', text='Translucency Strength') box.prop(n2.inputs[0], 'default_value', text='Translucency Strength')
box.prop(n3.inputs[7], 'default_value', text='Translucency Tint') box.prop(n3.inputs[7], 'default_value', text='Translucency Tint')
@ -395,15 +403,9 @@ class BSBST_PT_brushstroke_tools_panel(bpy.types.Panel):
if not settings.preset_object and is_preset: if not settings.preset_object and is_preset:
style_panel.operator("brushstroke_tools.init_preset", icon='MODIFIER') style_panel.operator("brushstroke_tools.init_preset", icon='MODIFIER')
else: else:
material_header, material_panel = style_panel.panel("brushstrokes_material", default_closed=False)
material_header.label(text='Material', icon='MATERIAL')
if material_panel:
material_row = material_panel.row(align=True)
material_row.template_ID(settings, 'context_material')
if settings.context_material: if settings.context_material:
if getattr(settings.context_material, '["BSBST"]', False): if getattr(settings.context_material, '["BSBST"]', False):
draw_material_settings(material_panel, settings.context_material, surface_object=surface_object) draw_material_settings(style_panel, settings.context_material, surface_object=surface_object)
elif settings.view_tab == 'SHAPE': elif settings.view_tab == 'SHAPE':
if style_object: if style_object:
for mod in style_object.modifiers: for mod in style_object.modifiers: