[Bf-blender-cvs] [b458ea6b233] geometry-nodes: Rename: "Nodes" modifier to "Empty" (take 2)

[Dalai Felinto]

Commit: b458ea6b23381a9acb90dbbd73ced678e1d404c5
Author: Dalai Felinto
Date:   Fri Nov 13 23:26:39 2020 +0100
Branches: geometry-nodes
https://developer.blender.org/rBb458ea6b23381a9acb90dbbd73ced678e1d404c5

Rename: "Nodes" modifier to "Empty" (take 2)

Leave the internal DNA data struct as "Nodes", and only rename the
modifier and user interface to Empty.

See 4a2734a835c10d5bffaaceddc59c for the original take and the reasoning
for renaming from Nodes to Empty.

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

M	source/blender/blenkernel/intern/node.c
M	source/blender/editors/object/object_modifier.c
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/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 9f3793e76fb..685017eb37f 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -3987,7 +3987,7 @@ void ntreeUpdateAllUsers(Main *main, bNodeTree *ngroup)
   if (ngroup->type == NTREE_GEOMETRY) {
     LISTBASE_FOREACH (Object *, object, &main->objects) {
       LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
-        if (md->type == eModifierType_Nodes) {
+        if (md->type == eModifierType_Empty) {
           NodesModifierData *nmd = (NodesModifierData *)md;
           if (nmd->node_group == ngroup) {
             MOD_nodes_update_interface(object, nmd);
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 6bd95cd8e51..9af7d737f23 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -234,7 +234,7 @@ ModifierData *ED_object_modifier_add(
       /* ensure skin-node customdata exists */
       BKE_mesh_ensure_skin_customdata(ob->data);
     }
-    else if (type == eModifierType_Nodes) {
+    else if (type == eModifierType_Empty) {
       MOD_nodes_init(bmain, (NodesModifierData *)new_md);
     }
   }
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index d7ad1d59002..814f4773248 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -94,7 +94,7 @@ typedef enum ModifierType {
   eModifierType_WeightedNormal = 54,
   eModifierType_Weld = 55,
   eModifierType_Fluid = 56,
-  eModifierType_Nodes = 57,
+  eModifierType_Empty = 57,
   eModifierType_MeshToVolume = 58,
   eModifierType_VolumeDisplace = 59,
   eModifierType_VolumeToMesh = 60,
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index d0697530e0c..5b3bd61a1a4 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -163,7 +163,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
      ICON_MOD_MULTIRES,
      "Multiresolution",
      "Subdivide the mesh in a way that allows editing the higher subdivision levels"},
-    {eModifierType_Nodes, "NODES", ICON_MESH_DATA, "Nodes", ""}, /* TODO: Use correct icon. */
+    {eModifierType_Empty, "EMPTY", ICON_MESH_DATA, "Empty", ""}, /* TODO: Use correct icon. */
     {eModifierType_Remesh,
      "REMESH",
      ICON_MOD_REMESH,
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index 93d1c60f1ba..6dfc2f2bdba 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -945,7 +945,7 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
 
 static void panelRegister(ARegionType *region_type)
 {
-  modifier_panel_register(region_type, eModifierType_Nodes, panel_draw);
+  modifier_panel_register(region_type, eModifierType_Empty, panel_draw);
 }
 
 static void blendWrite(BlendWriter *writer, const ModifierData *md)