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

19
materialx/__init__.py
View File

@ -2,16 +2,16 @@
# Copyright 2022, AMD # Copyright 2022, AMD
""" """
MaterialX NodeTree addon + MaterialX online library MaterialX nodes addon
""" """
bl_info = { bl_info = {
"name": "MaterialX NodeTree", "name": "MaterialX nodes",
"description": "MaterialX NodeTree addon + MaterialX online library", "description": "MaterialX nodes addon",
"author": "AMD", "author": "AMD",
"version": (1, 0, 0), "version": (1, 0, 0),
"blender": (3, 4, 0), "blender": (3, 4, 0),
"location": "Editor Type -> MaterialX", "location": "Editor Type -> Shader Editor",
"doc_url": "{BLENDER_MANUAL_URL}/addons/materials/materialx.html", "doc_url": "{BLENDER_MANUAL_URL}/addons/materials/materialx.html",
"warning": "Alpha", "warning": "Alpha",
"support": "TESTING", "support": "TESTING",
@ -21,8 +21,6 @@ bl_info = {
ADDON_ALIAS = "materialx" ADDON_ALIAS = "materialx"
import bpy
from . import ( from . import (
preferences, preferences,
nodes, nodes,
@ -34,15 +32,10 @@ from . import logging
log = logging.Log("__init__") log = logging.Log("__init__")
register_classes, unregister_classes = bpy.utils.register_classes_factory([
preferences.AddonPreferences,
])
def register(): def register():
log("register") log("register")
register_classes() preferences.register()
nodes.register() nodes.register()
ui.register() ui.register()
@ -54,4 +47,4 @@ def unregister():
ui.unregister() ui.unregister()
nodes.unregister() nodes.unregister()
unregister_classes() preferences.unregister()

4
materialx/preferences.py
View File

@ -42,3 +42,7 @@ def addon_preferences():
return bpy.context.preferences.addons[ADDON_ALIAS].preferences return bpy.context.preferences.addons[ADDON_ALIAS].preferences
register, unregister = bpy.utils.register_classes_factory([
AddonPreferences,
])