diff options
author | Dalai Felinto <dalai@blender.org> | 2020-11-19 18:11:24 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-11-19 18:11:24 +0300 |
commit | 0f1fe96e0b23127cd925852b32d9121c0b972962 (patch) | |
tree | 980f655fadadf722499d479df049145d679e1cdc | |
parent | 417924d84091d8957baac672db1387e502a46c25 (diff) |
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.
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_modifier.c | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_nodes.cc | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_util.c | 2 |
6 files changed, 6 insertions, 6 deletions
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; } |