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 +28 -12
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dc03e5862f - Show all commits

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

@ -40,6 +40,14 @@ def update_context_material(self, context):
if not style_object: if not style_object:
return return
utils.set_brushstroke_material(style_object, self.context_material) utils.set_brushstroke_material(style_object, self.context_material)
ng = bpy.data.node_groups.get(f'BSBST-BS.{self.context_material.brush_style}')
if not ng:
utils.set_preview(None)
return
if ng.preview:
utils.set_preview(ng.preview.image_pixels_float, ng.preview.image_size[:], ng.name)
else:
utils.set_preview(None)
def update_link_context_type(self, context): def update_link_context_type(self, context):
self.link_context = True self.link_context = True
@ -134,9 +142,8 @@ def set_brush_style(self, value):
ng_name = f'BSBST-BS.{value}' ng_name = f'BSBST-BS.{value}'
ng = utils.ensure_node_group(ng_name, [bs for bs in addon_prefs.brush_styles if bs.name==value][0].filepath) ng = utils.ensure_node_group(ng_name, [bs for bs in addon_prefs.brush_styles if bs.name==value][0].filepath)
if utils.compare_versions(bpy.app.version, (4,2,4)) >= 0:
if ng.preview: if ng.preview:
utils.set_preview(ng.preview.image_pixels_float, ng.preview.image_size[:]) utils.set_preview(ng.preview.image_pixels_float, ng.preview.image_size[:], ng.name)
else: else:
utils.set_preview(None) utils.set_preview(None)

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

@ -6,6 +6,8 @@ from bpy.app.handlers import persistent
addon_version = (0,0,0) addon_version = (0,0,0)
preview_name = '.BSBST-preview'
ng_list = [ ng_list = [
".brushstroke_tools.draw_processing", ".brushstroke_tools.draw_processing",
".brushstroke_tools.pre_processing", ".brushstroke_tools.pre_processing",
@ -587,17 +589,23 @@ def round_n(val, n):
""" """
return round(val, n-int(math.floor(math.log10(abs(val))))-1) return round(val, n-int(math.floor(math.log10(abs(val))))-1)
def set_preview(pixels, size = (256, 256)): def clear_preview():
preview_name = '.BSBST-preview'
preview_img = bpy.data.images.get(preview_name) preview_img = bpy.data.images.get(preview_name)
preview_texture = bpy.data.textures.get(preview_name) preview_texture = bpy.data.textures.get(preview_name)
if not pixels:
if preview_img: if preview_img:
bpy.data.images.remove(preview_img) bpy.data.images.remove(preview_img)
if preview_texture: if preview_texture:
bpy.data.textures.remove(preview_texture) bpy.data.textures.remove(preview_texture)
def set_preview(pixels, size = (256, 256), id=''):
preview_img = bpy.data.images.get(preview_name)
preview_texture = bpy.data.textures.get(preview_name)
if not pixels or compare_versions(bpy.app.version, (4,2,4)) < 0:
clear_preview()
return return
if preview_img: if preview_img:
if id and id == preview_img['BSBST-id']:
return
if not len(preview_img.pixels) == len(pixels): if not len(preview_img.pixels) == len(pixels):
bpy.data.images.remove(preview_img) bpy.data.images.remove(preview_img)
preview_img = None preview_img = None
@ -613,6 +621,7 @@ def set_preview(pixels, size = (256, 256)):
preview_texture.image = preview_img preview_texture.image = preview_img
preview_img.pixels.foreach_set(numpy.array(pixels, dtype=numpy.float32)) preview_img.pixels.foreach_set(numpy.array(pixels, dtype=numpy.float32))
preview_img['BSBST-id'] = id
preview_img.pack() preview_img.pack()