[Bf-blender-cvs] [4a2734a835c] geometry-nodes: Rename: "Nodes" modifier to "Empty"
Dalai Felinto
noreply at git.blender.org
Fri Nov 13 22:16:40 CET 2020
Commit: 4a2734a835c10d5bffaaceddc59c41837801f402
Author: Dalai Felinto
Date: Fri Nov 13 21:35:41 2020 +0100
Branches: geometry-nodes
https://developer.blender.org/rB4a2734a835c10d5bffaaceddc59c41837801f402
Rename: "Nodes" modifier to "Empty"
This introduces a regression. Users need to re-create their modifiers
and set their values again. The NodeGroups are intact so all they need
is to create new "Empty" modifiers and set the node group.
---
Original problem: Eventually most modifiers will be node-based, so naming
this new modifier "Nodes" will get outdated pretty quickly.
Calling it "Empty" it's fairly descriptive, since the node tree simply connects
the modifier Input to an Output, without any effect.
There is a potential problem, that it could be associated with the
Empty object type. Like some sort of Hook.
This is the task T82700, and the design task T82537.
===================================================================
M source/blender/blenkernel/intern/node.c
M source/blender/editors/object/object_modifier.c
M source/blender/makesdna/DNA_modifier_defaults.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/intern/dna_defaults.c
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/MOD_modifiertypes.h
M source/blender/modifiers/MOD_nodes.h
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 9f3793e76fb..fdd5704aa75 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -3987,10 +3987,10 @@ 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) {
- NodesModifierData *nmd = (NodesModifierData *)md;
- if (nmd->node_group == ngroup) {
- MOD_nodes_update_interface(object, nmd);
+ if (md->type == eModifierType_Empty) {
+ EmptyModifierData *emd = (EmptyModifierData *)md;
+ if (emd->node_group == ngroup) {
+ MOD_nodes_update_interface(object, emd);
}
}
}
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 6bd95cd8e51..1812f4a015d 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -234,8 +234,8 @@ ModifierData *ED_object_modifier_add(
/* ensure skin-node customdata exists */
BKE_mesh_ensure_skin_customdata(ob->data);
}
- else if (type == eModifierType_Nodes) {
- MOD_nodes_init(bmain, (NodesModifierData *)new_md);
+ else if (type == eModifierType_Empty) {
+ MOD_nodes_init(bmain, (EmptyModifierData *)new_md);
}
}
diff --git a/source/blender/makesdna/DNA_modifier_defaults.h b/source/blender/makesdna/DNA_modifier_defaults.h
index f73f43ddade..8bcd41e6aa8 100644
--- a/source/blender/makesdna/DNA_modifier_defaults.h
+++ b/source/blender/makesdna/DNA_modifier_defaults.h
@@ -573,7 +573,7 @@
.flag = 0, \
}
-#define _DNA_DEFAULT_NodesModifierData \
+#define _DNA_DEFAULT_EmptyModifierData \
{ 0 }
#define _DNA_DEFAULT_SkinModifierData \
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index d7ad1d59002..35f03311552 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,
@@ -2220,16 +2220,16 @@ enum {
#define MOD_MESHSEQ_READ_ALL \
(MOD_MESHSEQ_READ_VERT | MOD_MESHSEQ_READ_POLY | MOD_MESHSEQ_READ_UV | MOD_MESHSEQ_READ_COLOR)
-typedef struct NodesModifierSettings {
+typedef struct EmptyModifierSettings {
/* This stores data that is passed into the node group. */
struct IDProperty *properties;
-} NodesModifierSettings;
+} EmptyModifierSettings;
-typedef struct NodesModifierData {
+typedef struct EmptyModifierData {
ModifierData modifier;
struct bNodeTree *node_group;
- struct NodesModifierSettings settings;
-} NodesModifierData;
+ struct EmptyModifierSettings settings;
+} EmptyModifierData;
typedef struct MeshToVolumeModifierData {
ModifierData modifier;
diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c
index 1a8bd25215f..7977a55d7be 100644
--- a/source/blender/makesdna/intern/dna_defaults.c
+++ b/source/blender/makesdna/intern/dna_defaults.c
@@ -271,7 +271,7 @@ SDNA_DEFAULT_DECL_STRUCT(ScrewModifierData);
/* Shape key modifier has no items. */
SDNA_DEFAULT_DECL_STRUCT(ShrinkwrapModifierData);
SDNA_DEFAULT_DECL_STRUCT(SimpleDeformModifierData);
-SDNA_DEFAULT_DECL_STRUCT(NodesModifierData);
+SDNA_DEFAULT_DECL_STRUCT(EmptyModifierData);
SDNA_DEFAULT_DECL_STRUCT(SkinModifierData);
SDNA_DEFAULT_DECL_STRUCT(SmoothModifierData);
/* Softbody modifier skipped for now. */
@@ -491,7 +491,7 @@ const void *DNA_default_table[SDNA_TYPE_MAX] = {
/* Shape key modifier has no items. */
SDNA_DEFAULT_DECL(ShrinkwrapModifierData),
SDNA_DEFAULT_DECL(SimpleDeformModifierData),
- SDNA_DEFAULT_DECL(NodesModifierData),
+ SDNA_DEFAULT_DECL(EmptyModifierData),
SDNA_DEFAULT_DECL(SkinModifierData),
SDNA_DEFAULT_DECL(SmoothModifierData),
/* Softbody modifier skipped for now. */
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index bc25a404de8..94472372eb4 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -566,8 +566,8 @@ extern StructRNA RNA_SimpleDeformModifier;
extern StructRNA RNA_SimplifyGpencilModifier;
extern StructRNA RNA_Simulation;
#ifdef WITH_GEOMETRY_NODES
-extern StructRNA RNA_NodesModifier;
-extern StructRNA RNA_NodesModifierSettings;
+extern StructRNA RNA_EmptyModifier;
+extern StructRNA RNA_EmptyModifierSettings;
#endif
extern StructRNA RNA_GeometryNode;
extern StructRNA RNA_GeometryNodeTree;
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index d0697530e0c..dab9ec970ae 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,
@@ -1586,25 +1586,25 @@ static int rna_MeshSequenceCacheModifier_read_velocity_get(PointerRNA *ptr)
# endif
}
-static bool rna_NodesModifier_node_group_poll(PointerRNA *ptr, PointerRNA value)
+static bool rna_EmptyModifier_node_group_poll(PointerRNA *ptr, PointerRNA value)
{
- NodesModifierData *nmd = ptr->data;
+ EmptyModifierData *emd = ptr->data;
bNodeTree *ntree = value.data;
- UNUSED_VARS(nmd, ntree);
+ UNUSED_VARS(emd, ntree);
return true;
}
-static void rna_NodesModifier_node_group_update(Main *bmain, Scene *scene, PointerRNA *ptr)
+static void rna_EmptyModifier_node_group_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
Object *object = (Object *)ptr->owner_id;
- NodesModifierData *nmd = ptr->data;
+ EmptyModifierData *emd = ptr->data;
rna_Modifier_dependency_update(bmain, scene, ptr);
- MOD_nodes_update_interface(object, nmd);
+ MOD_nodes_update_interface(object, emd);
}
-static IDProperty *rna_NodesModifierSettings_properties(PointerRNA *ptr, bool create)
+static IDProperty *rna_EmptyModifierSettings_properties(PointerRNA *ptr, bool create)
{
- NodesModifierSettings *settings = ptr->data;
+ EmptyModifierSettings *settings = ptr->data;
if (create && settings->properties == NULL) {
IDPropertyTemplate val = {0};
settings->properties = IDP_New(IDP_GROUP, &val, "Nodes Modifier Settings");
@@ -1612,7 +1612,7 @@ static IDProperty *rna_NodesModifierSettings_properties(PointerRNA *ptr, bool cr
return settings->properties;
}
-static char *rna_NodesModifierSettings_path(PointerRNA *UNUSED(ptr))
+static char *rna_EmptyModifierSettings_path(PointerRNA *UNUSED(ptr))
{
return BLI_strdup("settings");
}
@@ -6935,12 +6935,12 @@ static void rna_def_modifier_nodes_settings(BlenderRNA *brna)
{
StructRNA *srna;
- srna = RNA_def_struct(brna, "NodesModifierSettings", NULL);
- RNA_def_struct_nested(brna, srna, "NodesModifier");
- RNA_def_struct_path_func(srna, "rna_NodesModifierSettings_path");
+ srna = RNA_def_struct(brna, "EmptyModifierSettings", NULL);
+ RNA_def_struct_nested(brna, srna, "EmptyModifier");
+ RNA_def_struct_path_func(srna, "rna_EmptyModifierSettings_path");
RNA_def_struct_ui_text(
srna, "Nodes Modifier Settings", "Settings that are passed into the node group");
- RNA_def_struct_idprops_func(srna, "rna_NodesModifierSettings_properties");
+ RNA_def_struct_idprops_func(srna, "rna_EmptyModifierSettings_properties");
}
static void rna_def_modifier_nodes(BlenderRNA *brna)
@@ -6948,18 +6948,18 @@ static void rna_def_modifier_nodes(BlenderRNA *brna)
StructRNA *srna;
PropertyRNA *prop;
- srna = RNA_def_struct(brna, "NodesModifier", "Modifier");
+ srna = RNA_def_struct(brna, "EmptyModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Nodes Modifier", "");
- RNA_def_struct_sdna(srna, "NodesModifierData");
+ RNA_def_struct_sdna(srna, "EmptyModifierData");
RNA_def_struct_ui_icon(srna, ICON_MESH_DATA); /* TODO: Use correct icon. */
RNA_define_lib_overridable(true);
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_pointer_funcs(prop, NULL, NULL, NULL, "rna_EmptyModifier_node_group_poll");
RNA_def_property_flag(prop, PROP_EDITABLE);
- RNA_def_property_update(prop, 0, "rna_NodesModifier_node_group_update");
+ RNA_def_property_update(prop, 0, "rna_EmptyModifier_node_group_update");
prop = RNA_def_property(srna, "settings", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);
diff --git a/source/blender/modifiers/MOD_modifiertypes.h b/source/blender/modifiers/MOD_modifiertypes.h
index f36cb7ded9c..b4bd5828095 100644
--- a/source/blender/modifiers/MOD_modifiertypes.h
+++ b/source/blender/modifiers/MOD_modifiertypes.h
@@ -85,7 +85,7 @@ extern ModifierTypeInfo modifierType_CorrectiveSmooth;
extern ModifierTypeInfo modifierType_MeshSequenceCache;
extern ModifierTypeInfo modifierType_SurfaceDeform;
extern ModifierTypeInfo modifierType_WeightedNormal;
-extern ModifierTypeInfo modifierType_Nodes;
+extern ModifierTypeInfo modifierType_Empty;
extern ModifierTypeInfo modifierType_MeshToVolume;
extern ModifierTypeInfo modifierType_VolumeDisplace;
extern ModifierTypeInfo modifierType_VolumeToMesh;
diff --git a/source/blender/modifiers/MOD_node
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list