[Bf-blender-cvs] [b9525e3279c] geometry-nodes: Geometry Nodes: correct modifier name when creating from node editor

[Jacques Lucke]

Commit: b9525e3279c4303f39da7e9b41b423b9fb0baf9c
Author: Jacques Lucke
Date:   Tue Dec 1 11:32:36 2020 +0100
Branches: geometry-nodes
https://developer.blender.org/rBb9525e3279c4303f39da7e9b41b423b9fb0baf9c

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.

===================================================================

M	release/scripts/startup/bl_operators/geometry_nodes.py
M	release/scripts/startup/bl_ui/space_node.py

===================================================================

diff --git a/release/scripts/startup/bl_operators/geometry_nodes.py b/release/scripts/startup/bl_operators/geometry_nodes.py
index 23926f28ab0..7d7e3793dba 100644
--- a/release/scripts/startup/bl_operators/geometry_nodes.py
+++ b/release/scripts/startup/bl_operators/geometry_nodes.py
@@ -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,
 )
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index 9ad454d49e1..1c4d1919f43 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -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