Merge branch 'main' into docs-prettify

BradyAJohnston · Dec 19, 2024 · 77303a6 · 77303a6
2 parents f1a1679 + 3fc2eb8
commit 77303a6
Show file tree

Hide file tree

Showing 31 changed files with 52 additions and 1,317 deletions.
diff --git a/molecularnodes/blender/coll.py b/molecularnodes/blender/coll.py
@@ -1,6 +1,6 @@
 import bpy
 from bpy.types import Collection
-from ..bpyd.collection import create_collection
+from databpy.collection import create_collection
 
 
 def mn() -> Collection:

diff --git a/molecularnodes/blender/material.py b/molecularnodes/blender/material.py
@@ -1,5 +1,5 @@
 from bpy.types import Material
-from ..bpyd.material import append_from_blend
+from databpy.material import append_from_blend
 from ..utils import MN_DATA_FILE
 
 MATERIAL_NAMES = [

diff --git a/molecularnodes/blender/mesh.py b/molecularnodes/blender/mesh.py
@@ -2,8 +2,8 @@
 import numpy as np
 
 from . import coll, nodes
-from ..bpyd.attribute import AttributeTypes
-from ..bpyd.object import create_bob
+from databpy.attribute import AttributeTypes
+from databpy.object import create_bob
 
 
 def evaluate_using_mesh(obj: bpy.types.Object) -> bpy.types.Object:

diff --git a/molecularnodes/blender/nodes.py b/molecularnodes/blender/nodes.py
@@ -11,8 +11,8 @@
 
 from .. import color, utils
 from . import mesh
-from .. import bpyd
-from ..bpyd.nodes import (
+import databpy
+from databpy.nodes import (
     NodeGroupCreationError,
     append_from_blend,
     swap_tree,
@@ -560,7 +560,7 @@ def create_assembly_node_tree(
             "name": "assembly_id",
             "type": "NodeSocketInt",
             "min": 1,
-            "max": max(bpyd.named_attribute(data_object, "assembly_id")),
+            "max": max(databpy.named_attribute(data_object, "assembly_id")),
             "default": 1,
         },
     )

diff --git a/molecularnodes/bpyd/__init__.py b/molecularnodes/bpyd/__init__.py