blender/blender-addons
19
43
Fork 96
Code Issues 630 Pull Requests 27 Projects 1 Releases Wiki Activity

WIP: MaterialX addon #104594

Closed
Bogdan Nagirniak wants to merge 34 commits from BogdanNagirniak/blender-addons:materialx-addon into main
pull from: BogdanNagirniak/blender-addons:materialx-addon
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 34 Files Changed 18 +31 -3
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c5b73128df - Show all commits

2
materialx/material/properties.py
View File

@ -84,7 +84,6 @@ class MaterialProperties(MaterialXProperties):
return mtlx_file, doc return mtlx_file, doc
def convert_to_materialx(self, obj: bpy.types.Object = None): def convert_to_materialx(self, obj: bpy.types.Object = None):
mat = self.id_data mat = self.id_data
output_node = self.output_node output_node = self.output_node
@ -109,6 +108,7 @@ class MaterialProperties(MaterialXProperties):
mtlx_file = get_temp_file(".mtlx", mtlx_file = get_temp_file(".mtlx",
f'{mat.name}_{self.mx_node_tree.name if self.mx_node_tree else ""}') f'{mat.name}_{self.mx_node_tree.name if self.mx_node_tree else ""}')
mx.writeToXmlFile(doc, str(mtlx_file)) mx.writeToXmlFile(doc, str(mtlx_file))
search_path = mx.FileSearchPath(str(mtlx_file.parent)) search_path = mx.FileSearchPath(str(mtlx_file.parent))
search_path.append(str(MX_LIBS_DIR)) search_path.append(str(MX_LIBS_DIR))

30
materialx/utils.py
View File

@ -14,7 +14,6 @@ from . import ADDON_ALIAS
from . import logging from . import logging
log = logging.Log('utils') log = logging.Log('utils')
ADDON_ROOT_DIR = Path(__file__).parent ADDON_ROOT_DIR = Path(__file__).parent
ADDON_DATA_DIR = Path(bpy.utils.user_resource('SCRIPTS', path=f"addons/{ADDON_ALIAS}_data", create=True)) ADDON_DATA_DIR = Path(bpy.utils.user_resource('SCRIPTS', path=f"addons/{ADDON_ALIAS}_data", create=True))
BL_DATA_DIR = Path(bpy.utils.resource_path('LOCAL')) / "datafiles/materialx" BL_DATA_DIR = Path(bpy.utils.resource_path('LOCAL')) / "datafiles/materialx"
@ -444,3 +443,32 @@ def update_ui(area_type='PROPERTIES', region_type='WINDOW'):
for region in area.regions: for region in area.regions:
if region.type == region_type: if region.type == region_type:
region.tag_redraw() region.tag_redraw()
def update_materialx_data(depsgraph, materialx_data):
from .node_tree import MxNodeTree
if not depsgraph.updates:
return
for mx_node_tree in (upd.id for upd in depsgraph.updates if isinstance(upd.id, MxNodeTree)):
for material in bpy.data.materials:
if material.materialx.mx_node_tree and material.materialx.mx_node_tree.name == mx_node_tree.name:
doc = material.materialx.export(None)
if not doc:
# log.warn("MX export failed", mat)
continue
matx_data = next((mat for mat in materialx_data if mat[0] == material.name), None)
if not matx_data:
mx_file = get_temp_file(".mtlx",
f'{material.name}{material.materialx.mx_node_tree.name if material.materialx.mx_node_tree else ""}',
False)
mx.writeToXmlFile(doc, str(mx_file))
surfacematerial = next((node for node in doc.getNodes()
if node.getCategory() == 'surfacematerial'))
materialx_data.append((material.name, str(mx_file), surfacematerial.getName()))
else:
mx.writeToXmlFile(doc, str(matx_data[1]))