blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Geometry Nodes: correct modifier name when creating from node editor 

The name should be the same as when the modifier is created in the
modifier tab of the properties editor.
This commit is contained in:
Jacques Lucke 2020-12-01 11:32:36 +01:00
parent 58cc8938e1
commit 074de755e9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
release/scripts/startup/bl_operators/geometry_nodes.py
View File

@ -42,10 +42,10 @@ def geometry_modifier_poll(context) -> bool:
return True
class NewGeometryNodeModifier(bpy.types.Operator):
class NewGeometryNodesModifier(bpy.types.Operator):
"""Create a new modifier with a new geometry node group"""
bl_idname = "node.new_geometry_node_modifier"
bl_idname = "node.new_geometry_nodes_modifier"
bl_label = "New Geometry Node Modifier"
bl_options = {'REGISTER', 'UNDO'}
@ -54,7 +54,7 @@ class NewGeometryNodeModifier(bpy.types.Operator):
return geometry_modifier_poll(context)
def execute(self, context):
modifier = context.object.modifiers.new("Empty", "NODES")
modifier = context.object.modifiers.new("GeometryNodes", "NODES")
if not modifier:
return {'CANCELLED'}
@ -89,6 +89,6 @@ class NewGeometryNodeTreeAssign(bpy.types.Operator):
classes = (
NewGeometryNodeModifier,
NewGeometryNodesModifier,
NewGeometryNodeTreeAssign,
)

6
release/scripts/startup/bl_ui/space_node.py
View File

@ -163,11 +163,11 @@ class NODE_HT_header(Header):
row.template_ID(snode, "node_tree", new="node.new_geometry_node_group_assign")
elif ob:
active_modifier = ob.modifiers.active
if active_modifier and active_modifier.type == "NODES":
if active_modifier and active_modifier.type == "NODES":
row.template_ID(active_modifier, "node_group", new="node.new_geometry_node_group_assign")
else:
row.template_ID(snode, "node_tree", new="node.new_geometry_node_modifier")
row.template_ID(snode, "node_tree", new="node.new_geometry_nodes_modifier")
else:
# Custom node tree is edited as independent ID block