[Bf-blender-cvs] [97a93566e92] geometry-nodes: Geometry Nodes: change "Node Tree" to "Node Group"

[Jacques Lucke]

Commit: 97a93566e92e4a40ee0e1cfd5a35f40da9a8904a
Author: Jacques Lucke
Date:   Thu Oct 22 15:52:15 2020 +0200
Branches: geometry-nodes
https://developer.blender.org/rB97a93566e92e4a40ee0e1cfd5a35f40da9a8904a

Geometry Nodes: change "Node Tree" to "Node Group"

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

M	release/scripts/startup/bl_operators/geometry_nodes.py
M	source/blender/makesdna/DNA_modifier_types.h
M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/modifiers/intern/MOD_nodes.cc

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

diff --git a/release/scripts/startup/bl_operators/geometry_nodes.py b/release/scripts/startup/bl_operators/geometry_nodes.py
index 0d43541e65c..7643c49f33e 100644
--- a/release/scripts/startup/bl_operators/geometry_nodes.py
+++ b/release/scripts/startup/bl_operators/geometry_nodes.py
@@ -31,7 +31,7 @@ class NewGeometryNodeTree(bpy.types.Operator):
         return context.area.type == 'NODE_EDITOR' and context.space_data.tree_type == 'GeometryNodeTree'
 
     def execute(self, context):
-        group = bpy.data.node_groups.new("Node Tree", 'GeometryNodeTree')
+        group = bpy.data.node_groups.new("Geometry Node Group", 'GeometryNodeTree')
         group.inputs.new('NodeSocketGeometry', "Geometry")
         group.outputs.new('NodeSocketGeometry', "Geometry")
         input_node = group.nodes.new('NodeGroupInput')
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 7e3c2deb6be..3df80e1157d 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -2219,7 +2219,7 @@ enum {
 
 typedef struct NodesModifierData {
   ModifierData modifier;
-  struct bNodeTree *node_tree;
+  struct bNodeTree *node_group;
 } NodesModifierData;
 
 typedef struct MeshToVolumeModifierData {
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 65804bc54d2..7715a35af76 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -1597,7 +1597,7 @@ static int rna_MeshSequenceCacheModifier_read_velocity_get(PointerRNA *ptr)
 #  endif
 }
 
-static bool rna_NodesModifier_node_tree_poll(PointerRNA *ptr, PointerRNA value)
+static bool rna_NodesModifier_node_group_poll(PointerRNA *ptr, PointerRNA value)
 {
   NodesModifierData *nmd = ptr->data;
   bNodeTree *ntree = value.data;
@@ -6935,9 +6935,9 @@ static void rna_def_modifier_nodes(BlenderRNA *brna)
 
   RNA_define_lib_overridable(true);
 
-  prop = RNA_def_property(srna, "node_tree", PROP_POINTER, PROP_NONE);
-  RNA_def_property_ui_text(prop, "Node Tree", "Node tree that controls what this modifier does");
-  RNA_def_property_pointer_funcs(prop, NULL, NULL, NULL, "rna_NodesModifier_node_tree_poll");
+  prop = RNA_def_property(srna, "node_group", PROP_POINTER, PROP_NONE);
+  RNA_def_property_ui_text(prop, "Node Group", "Node group that controls what this modifier does");
+  RNA_def_property_pointer_funcs(prop, NULL, NULL, NULL, "rna_NodesModifier_node_group_poll");
   RNA_def_property_flag(prop, PROP_EDITABLE);
   RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index 7ca40811b3e..ddf89074da0 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -80,15 +80,15 @@ static void initData(ModifierData *md)
 static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
 {
   NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
-  if (nmd->node_tree != nullptr) {
-    DEG_add_node_tree_relation(ctx->node, nmd->node_tree, "Nodes Modifier");
+  if (nmd->node_group != nullptr) {
+    DEG_add_node_tree_relation(ctx->node, nmd->node_group, "Nodes Modifier");
   }
 }
 
 static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
 {
   NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
-  walk(userData, ob, (ID **)&nmd->node_tree, IDWALK_CB_USER);
+  walk(userData, ob, (ID **)&nmd->node_group, IDWALK_CB_USER);
 }
 
 static bool isDisabled(const struct Scene *UNUSED(scene),
@@ -241,12 +241,12 @@ static GeometryPtr compute_geometry(const DOutputSocket *group_input,
 static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *UNUSED(ctx), Mesh *mesh)
 {
   NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
-  if (nmd->node_tree == nullptr) {
+  if (nmd->node_group == nullptr) {
     return mesh;
   }
 
   NodeTreeRefMap tree_refs;
-  DerivedNodeTree tree{nmd->node_tree, tree_refs};
+  DerivedNodeTree tree{nmd->node_group, tree_refs};
 
   Span<const DNode *> input_nodes = tree.nodes_by_type("NodeGroupInput");
   Span<const DNode *> output_nodes = tree.nodes_by_type("NodeGroupOutput");
@@ -294,7 +294,7 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
   uiLayoutSetPropSep(layout, true);
   uiLayoutSetPropDecorate(layout, false);
 
-  uiItemR(layout, ptr, "node_tree", 0, NULL, ICON_MESH_DATA);
+  uiItemR(layout, ptr, "node_group", 0, NULL, ICON_MESH_DATA);
 
   modifier_panel_end(layout, ptr);
 }