BogdanNagirniak/blender-addons
0
1
Fork 2
forked from blender/blender-addons
Code Pull Requests Activity

Adjust generating node classes and searching of mtlx files #7

Merged
Bogdan Nagirniak merged 2 commits from BLEN-363 into materialx-addon 2023-04-11 17:50:44 +02:00
Conversation 0 Commits 2 Files Changed 2 +17
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
materialx/nodes/generate_node_classes.py
View File

@ -274,7 +274,21 @@ from bpy.props import (
)
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()}"
""")

3
materialx/utils.py
View File

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