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 +13 -6
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 90fd62a89b - Show all commits

BIN
scripts-blender/addons/brushstroke_tools/assets/brushstroke_tools-resources.blend
View File

Binary file not shown.

10
scripts-blender/addons/brushstroke_tools/ops.py
View File

@ -147,7 +147,7 @@ class BSBST_OT_new_brushstrokes(bpy.types.Operator):
if not settings.preset_object: if not settings.preset_object:
bpy.ops.brushstroke_tools.init_preset() bpy.ops.brushstroke_tools.init_preset()
# transfer preset modifiers to new brushstrokes # transfer preset modifiers to new brushstrokes TODO: refactor to deduplicate
for mod in settings.preset_object.modifiers: for mod in settings.preset_object.modifiers:
utils.transfer_modifier(mod.name, brushstrokes_object, settings.preset_object) utils.transfer_modifier(mod.name, brushstrokes_object, settings.preset_object)
@ -165,6 +165,9 @@ class BSBST_OT_new_brushstrokes(bpy.types.Operator):
elif link_context_type=='MATERIAL': elif link_context_type=='MATERIAL':
brushstrokes_object.modifiers[mod.name][f'{v.identifier}'] = settings.context_material brushstrokes_object.modifiers[mod.name][f'{v.identifier}'] = settings.context_material
elif link_context_type=='UVMAP': elif link_context_type=='UVMAP':
if type(brushstrokes_object.modifiers[mod.name][f'{v.identifier}']) == str:
brushstrokes_object.modifiers[mod.name][f'{v.identifier}'] = surface_object.data.uv_layers.active.name
else:
brushstrokes_object.modifiers[mod.name][f'{v.identifier}_use_attribute'] = True brushstrokes_object.modifiers[mod.name][f'{v.identifier}_use_attribute'] = True
brushstrokes_object.modifiers[mod.name][f'{v.identifier}_attribute_name'] = surface_object.data.uv_layers.active.name brushstrokes_object.modifiers[mod.name][f'{v.identifier}_attribute_name'] = surface_object.data.uv_layers.active.name
elif link_context_type=='RANDOM': elif link_context_type=='RANDOM':
@ -389,7 +392,7 @@ class BSBST_OT_copy_brushstrokes(bpy.types.Operator):
new_bs = list(set(bpy.data.objects[:]) - all_obj) new_bs = list(set(bpy.data.objects[:]) - all_obj)
del all_obj del all_obj
# remap surface pointers and context linked data # remap surface pointers and context linked data TODO: refactor to deduplicate
for ob in new_bs: for ob in new_bs:
ob.parent = surface_object ob.parent = surface_object
utils.set_surface_object(ob, surface_object) utils.set_surface_object(ob, surface_object)
@ -412,6 +415,9 @@ class BSBST_OT_copy_brushstrokes(bpy.types.Operator):
if link_context_type=='SURFACE_OBJECT': if link_context_type=='SURFACE_OBJECT':
ob.modifiers[mod.name][f'{v.identifier}'] = surface_object ob.modifiers[mod.name][f'{v.identifier}'] = surface_object
elif link_context_type=='UVMAP': elif link_context_type=='UVMAP':
if type(ob.modifiers[mod.name][f'{v.identifier}']) == str:
ob.modifiers[mod.name][f'{v.identifier}'] = surface_object.data.uv_layers.active.name
else:
ob.modifiers[mod.name][f'{v.identifier}_use_attribute'] = True ob.modifiers[mod.name][f'{v.identifier}_use_attribute'] = True
ob.modifiers[mod.name][f'{v.identifier}_attribute_name'] = surface_object.data.uv_layers.active.name ob.modifiers[mod.name][f'{v.identifier}_attribute_name'] = surface_object.data.uv_layers.active.name
elif link_context_type=='RANDOM': elif link_context_type=='RANDOM':

1
scripts-blender/addons/brushstroke_tools/utils.py
View File

@ -18,6 +18,7 @@ linkable_sockets = [
bpy.types.NodeTreeInterfaceSocketVector, bpy.types.NodeTreeInterfaceSocketVector,
bpy.types.NodeTreeInterfaceSocketFloat, bpy.types.NodeTreeInterfaceSocketFloat,
bpy.types.NodeTreeInterfaceSocketInt, bpy.types.NodeTreeInterfaceSocketInt,
bpy.types.NodeTreeInterfaceSocketString,
] ]
asset_lib_name = 'Brushstroke Tools Library' asset_lib_name = 'Brushstroke Tools Library'