[Bf-blender-cvs] [7e86f4b331a] temp-geometry-nodes-mix-attributes: rename to Attribute Mix node
Jacques Lucke
noreply at git.blender.org
Wed Dec 9 15:03:30 CET 2020
Commit: 7e86f4b331acee2c7ce3b305fb20c063fe56b6df
Author: Jacques Lucke
Date: Wed Dec 9 12:14:13 2020 +0100
Branches: temp-geometry-nodes-mix-attributes
https://developer.blender.org/rB7e86f4b331acee2c7ce3b305fb20c063fe56b6df
rename to Attribute Mix node
It was decided that the attribute nodes should have the name "Attribute" at the beginning.
===================================================================
M release/scripts/startup/nodeitems_builtins.py
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/intern/node.c
M source/blender/editors/space_node/drawnode.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/NOD_geometry.h
M source/blender/nodes/NOD_static_types.h
R089 source/blender/nodes/geometry/nodes/node_geo_mix_attributes.cc source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
===================================================================
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index 835698e38eb..d655a3c7a51 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -483,7 +483,7 @@ geometry_node_categories = [
GeometryNodeCategory("GEO_ATTRIBUTE", "Attribute", items=[
NodeItem("GeometryNodeRandomAttribute"),
NodeItem("GeometryNodeAttributeMath"),
- NodeItem("GeometryNodeMixAttributes"),
+ NodeItem("GeometryNodeAttributeMix"),
]),
GeometryNodeCategory("GEO_COLOR", "Color", items=[
NodeItem("ShaderNodeValToRGB"),
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 849cbb329f2..9f738356303 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1350,7 +1350,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
#define GEO_NODE_RANDOM_ATTRIBUTE 1008
#define GEO_NODE_ATTRIBUTE_MATH 1009
#define GEO_NODE_JOIN_GEOMETRY 1010
-#define GEO_NODE_MIX_ATTRIBUTES 1011
+#define GEO_NODE_ATTRIBUTE_MIX 1011
/** \} */
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 39750f61e68..1287bf81b77 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -4693,7 +4693,7 @@ static void registerGeometryNodes(void)
register_node_type_geo_random_attribute();
register_node_type_geo_attribute_math();
register_node_type_geo_join_geometry();
- register_node_type_geo_mix_attributes();
+ register_node_type_geo_attribute_mix();
}
static void registerFunctionNodes(void)
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index fc88a5a2b10..f9ef1f356f3 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -3182,9 +3182,9 @@ static void node_geometry_buts_attribute_math(uiLayout *layout,
uiItemR(layout, ptr, "input_type_b", DEFAULT_FLAGS, IFACE_("Type B"), ICON_NONE);
}
-static void node_geometry_buts_mix_attributes(uiLayout *layout,
- bContext *UNUSED(C),
- PointerRNA *ptr)
+static void node_geometry_buts_attribute_mix(uiLayout *layout,
+ bContext *UNUSED(C),
+ PointerRNA *ptr)
{
uiItemR(layout, ptr, "blend_type", DEFAULT_FLAGS, "", ICON_NONE);
}
@@ -3207,8 +3207,8 @@ static void node_geometry_set_butfunc(bNodeType *ntype)
case GEO_NODE_ATTRIBUTE_MATH:
ntype->draw_buttons = node_geometry_buts_attribute_math;
break;
- case GEO_NODE_MIX_ATTRIBUTES:
- ntype->draw_buttons = node_geometry_buts_mix_attributes;
+ case GEO_NODE_ATTRIBUTE_MIX:
+ ntype->draw_buttons = node_geometry_buts_attribute_mix;
break;
}
}
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 4f1ddebccb9..383594364ca 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -8368,7 +8368,7 @@ static void def_geo_attribute_math(StructRNA *srna)
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
}
-static void def_geo_mix_attributes(StructRNA *srna)
+static void def_geo_attribute_mix(StructRNA *srna)
{
PropertyRNA *prop;
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 6a8ec6624ce..6096c291ab3 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -143,7 +143,7 @@ set(SRC
geometry/nodes/node_geo_boolean.cc
geometry/nodes/node_geo_edge_split.cc
geometry/nodes/node_geo_join_geometry.cc
- geometry/nodes/node_geo_mix_attributes.cc
+ geometry/nodes/node_geo_attribute_mix.cc
geometry/nodes/node_geo_object_info.cc
geometry/nodes/node_geo_subdivision_surface.cc
geometry/nodes/node_geo_point_distribute.cc
diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h
index 0491a7cea74..ab48d1f1924 100644
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@ -37,7 +37,7 @@ void register_node_type_geo_object_info(void);
void register_node_type_geo_random_attribute(void);
void register_node_type_geo_attribute_math(void);
void register_node_type_geo_join_geometry(void);
-void register_node_type_geo_mix_attributes(void);
+void register_node_type_geo_attribute_mix(void);
#ifdef __cplusplus
}
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index a314b85e249..669e31828ea 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -277,7 +277,7 @@ DefNode(GeometryNode, GEO_NODE_OBJECT_INFO, 0, "OBJECT_INFO", ObjectInfo, "Objec
DefNode(GeometryNode, GEO_NODE_RANDOM_ATTRIBUTE, def_geo_random_attribute, "RANDOM_ATTRIBUTE", RandomAttribute, "Random Attribute", "")
DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_MATH, def_geo_attribute_math, "ATTRIBUTE_MATH", AttributeMath, "Attribute Math", "")
DefNode(GeometryNode, GEO_NODE_JOIN_GEOMETRY, 0, "JOIN_GEOMETRY", JoinGeometry, "Join Geometry", "")
-DefNode(GeometryNode, GEO_NODE_MIX_ATTRIBUTES, def_geo_mix_attributes, "MIX_ATTRIBUTES", MixAttributes, "Mix Attributes", "")
+DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_MIX, def_geo_attribute_mix, "ATTRIBUTE_MIX", AttributeMix, "Attribute Mix", "")
/* undefine macros */
#undef DefNode
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mix_attributes.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
similarity index 89%
rename from source/blender/nodes/geometry/nodes/node_geo_mix_attributes.cc
rename to source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
index d188f3d5765..69ad214dfa7 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mix_attributes.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
@@ -18,7 +18,7 @@
#include "node_geometry_util.hh"
-static bNodeSocketTemplate geo_node_mix_attributes_in[] = {
+static bNodeSocketTemplate geo_node_attribute_mix_in[] = {
{SOCK_GEOMETRY, N_("Geometry")},
{SOCK_STRING, N_("Factor")},
{SOCK_STRING, N_("Attribute A")},
@@ -83,7 +83,7 @@ static void do_mix_operation_color4f(const int blend_mode,
}
}
-static void mix_attributes_calc(GeometryComponent &component, const GeoNodeExecParams ¶ms)
+static void attribute_mix_calc(GeometryComponent &component, const GeoNodeExecParams ¶ms)
{
const bNode &node = params.node();
const int blend_mode = node.custom1;
@@ -148,15 +148,15 @@ static void mix_attributes_calc(GeometryComponent &component, const GeoNodeExecP
}
}
-static void geo_node_mix_attributes_exec(GeoNodeExecParams params)
+static void geo_node_attribute_mix_exec(GeoNodeExecParams params)
{
GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry");
if (geometry_set.has<MeshComponent>()) {
- mix_attributes_calc(geometry_set.get_component_for_write<MeshComponent>(), params);
+ attribute_mix_calc(geometry_set.get_component_for_write<MeshComponent>(), params);
}
if (geometry_set.has<PointCloudComponent>()) {
- mix_attributes_calc(geometry_set.get_component_for_write<PointCloudComponent>(), params);
+ attribute_mix_calc(geometry_set.get_component_for_write<PointCloudComponent>(), params);
}
params.set_output("Geometry", geometry_set);
@@ -164,12 +164,12 @@ static void geo_node_mix_attributes_exec(GeoNodeExecParams params)
} // namespace blender::nodes
-void register_node_type_geo_mix_attributes()
+void register_node_type_geo_attribute_mix()
{
static bNodeType ntype;
- geo_node_type_base(&ntype, GEO_NODE_MIX_ATTRIBUTES, "Mix Attributes", NODE_CLASS_ATTRIBUTE, 0);
- node_type_socket_templates(&ntype, geo_node_mix_attributes_in, geo_node_mix_attribute_out);
- ntype.geometry_node_execute = blender::nodes::geo_node_mix_attributes_exec;
+ geo_node_type_base(&ntype, GEO_NODE_ATTRIBUTE_MIX, "Attribute Mix", NODE_CLASS_ATTRIBUTE, 0);
+ node_type_socket_templates(&ntype, geo_node_attribute_mix_in, geo_node_mix_attribute_out);
+ ntype.geometry_node_execute = blender::nodes::geo_node_attribute_mix_exec;
nodeRegisterType(&ntype);
}
More information about the Bf-blender-cvs
mailing list