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

14
materialx/nodes/generate_node_classes.py
View File

@ -274,7 +274,21 @@ from bpy.props import (
) )
from {ADDON_ALIAS}.nodes.node import MxNode from {ADDON_ALIAS}.nodes.node import MxNode
""")
if file_path.is_relative_to(utils.MX_LIBS_DIR):
code_strings.append(
f"""from {ADDON_ALIAS}.utils import MX_LIBS_DIR
FILE_PATH = MX_LIBS_DIR / "{(file_path.relative_to(utils.MX_LIBS_DIR)).as_posix()}"
""")
elif file_path.is_relative_to(utils.MX_ADDON_LIBS_DIR):
code_strings.append(
f"""from {ADDON_ALIAS}.utils import MX_ADDON_LIBS_DIR
FILE_PATH = MX_ADDON_LIBS_DIR / "{(file_path.relative_to(utils.MX_ADDON_LIBS_DIR)).as_posix()}"
""")
else:
code_strings.append(
f"""
FILE_PATH = "{file_path.as_posix()}" FILE_PATH = "{file_path.as_posix()}"
""") """)

3
materialx/utils.py
View File

@ -5,6 +5,7 @@ import os
from pathlib import Path from pathlib import Path
import tempfile import tempfile
import shutil import shutil
import platform
import MaterialX as mx import MaterialX as mx
import bpy import bpy
@ -17,6 +18,8 @@ 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')).parent / "materialx" BL_DATA_DIR = Path(bpy.utils.resource_path('LOCAL')).parent / "materialx"
if platform.system() == 'Windows':
BL_DATA_DIR = BL_DATA_DIR.parent / "blender.shared" / BL_DATA_DIR.name
MX_LIBS_FOLDER = "libraries" MX_LIBS_FOLDER = "libraries"
MX_LIBS_DIR = BL_DATA_DIR / MX_LIBS_FOLDER MX_LIBS_DIR = BL_DATA_DIR / MX_LIBS_FOLDER