[Bf-blender-cvs] [0f1fe96e0b2] geometry-nodes: Geometry Nodes - Internal rename + API change: NODES for anything but UI

[Dalai Felinto]

Commit: 0f1fe96e0b23127cd925852b32d9121c0b972962
Author: Dalai Felinto
Date:   Thu Nov 19 16:11:24 2020 +0100
Branches: geometry-nodes
https://developer.blender.org/rB0f1fe96e0b23127cd925852b32d9121c0b972962

Geometry Nodes - Internal rename + API change: NODES for anything but UI

Most of the times the nodes will be non-empty. Empty is really only what
shows in the UI.

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

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
M	source/blender/modifiers/intern/MOD_util.c

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

diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index c3f5e58c307..79487bf7124 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_Empty) {
+        if (md->type == eModifierType_Nodes) {
           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 9af7d737f23..6bd95cd8e51 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_Empty) {
+    else if (type == eModifierType_Nodes) {
       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 814f4773248..d7ad1d59002 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_Empty = 57,
+  eModifierType_Nodes = 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 0710ca075fc..965395bf314 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -143,7 +143,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
      ICON_MOD_EDGESPLIT,
      "Edge Split",
      "Split away joined faces at the edges"},
-    {eModifierType_Empty, "EMPTY", ICON_NODETREE, "Empty", ""},
+    {eModifierType_Nodes, "NODES", ICON_NODETREE, "Empty", ""},
     {eModifierType_Mask,
      "MASK",
      ICON_MOD_MASK,
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index 261b7d2809c..d5bf2a6215e 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -950,7 +950,7 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
 
 static void panelRegister(ARegionType *region_type)
 {
-  modifier_panel_register(region_type, eModifierType_Empty, panel_draw);
+  modifier_panel_register(region_type, eModifierType_Nodes, panel_draw);
 }
 
 static void blendWrite(BlendWriter *writer, const ModifierData *md)
diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c
index 611d6de72da..55409cba114 100644
--- a/source/blender/modifiers/intern/MOD_util.c
+++ b/source/blender/modifiers/intern/MOD_util.c
@@ -345,6 +345,6 @@ void modifier_type_init(ModifierTypeInfo *types[])
   INIT_TYPE(MeshToVolume);
   INIT_TYPE(VolumeDisplace);
   INIT_TYPE(VolumeToMesh);
+  INIT_TYPE(Nodes);
 #undef INIT_TYPE
-  types[eModifierType_Empty] = &modifierType_Nodes;
 }