Merge: Blender official patch (8fb28124ba40836941ad0fef8b53d2b450250054)

nutti · Mar 21, 2023 · bef07dc · bef07dc
1 parent 57fc804
commit bef07dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/magic_uv/op/texture_projection.py b/src/magic_uv/op/texture_projection.py
@@ -452,7 +452,8 @@ def execute(self, context):
             # assign image
             if compat.check_version(2, 80, 0) >= 0:
                 node_tree = obj.active_material.node_tree
-                output_node = node_tree.nodes["Material Output"]
+                output_node = next(n for n in node_tree.nodes
+                                   if n.type == "OUTPUT_MATERIAL")
 
                 nodes = common.find_texture_nodes_from_material(
                     obj.active_material)

diff --git a/src/magic_uv/op/uv_inspection.py b/src/magic_uv/op/uv_inspection.py
@@ -455,7 +455,8 @@ def execute(self, context):
                 "MagicUV_PaintUVMaterial_{}".format(i))
             if compat.check_version(2, 80, 0) >= 0:
                 target_mtrl.use_nodes = True
-                output_node = target_mtrl.node_tree.nodes["Material Output"]
+                output_node = next(n for n in target_mtrl.node_tree.nodes
+                                   if n.type == "OUTPUT_MATERIAL")
                 nodes_to_remove = [n for n in target_mtrl.node_tree.nodes
                                    if n != output_node]
                 for n in nodes_to_remove: