diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-01-13 20:04:23 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-01-13 20:06:39 +0300 |
| commit | 08ee5573a92959c6739fb47541bdd20d1e72306b (patch) | |
| tree | dcc3eb4ffdedf6c773854b9cc395349ac2468733 /release | |
| parent | 09fe0e8aa94c10aa941cb09ab6eb80b8fbb097b4 (diff) | |
Fix Python warnings in node editor after revert of datablock changes
Revert was done in 2771dfd, ref T84669
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_grease_pencil_common.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 80e5b49f4fe..8b404c4a306 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -592,7 +592,7 @@ class GreasePencilMaterialsPanel: if show_full_ui: row = layout.row() - row.template_ID(ob, "active_material", new="material.new", duplicate="material.duplicate", live_icon=True) + row.template_ID(ob, "active_material", new="material.new", live_icon=True) slot = context.material_slot if slot: diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 0177579c5c2..e6af83b61f4 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -93,10 +93,10 @@ class NODE_HT_header(Header): # Show material.new when no active ID/slot exists if not id_from and ob_type in types_that_support_material: - row.template_ID(ob, "active_material", new="material.new", duplicate="material.duplicate") + row.template_ID(ob, "active_material", new="material.new") # Material ID, but not for Lights if id_from and ob_type != 'LIGHT': - row.template_ID(id_from, "active_material", new="material.new", duplicate="material.duplicate") + row.template_ID(id_from, "active_material", new="material.new") if snode.shader_type == 'WORLD': NODE_MT_editor_menus.draw_collapsible(context, layout) @@ -109,7 +109,7 @@ class NODE_HT_header(Header): row = layout.row() row.enabled = not snode.pin - row.template_ID(scene, "world", new="world.new", duplicate="world.duplicate") + row.template_ID(scene, "world", new="world.new") if snode.shader_type == 'LINESTYLE': view_layer = context.view_layer |