[Bf-blender-cvs] [df6a8199828] temp-geometry-nodes-fields-prototype: rename to Attribute Freeze
Jacques Lucke
noreply at git.blender.org
Tue Aug 10 16:10:17 CEST 2021
Commit: df6a81998285d1c03f1b602654bdfd109887a06c
Author: Jacques Lucke
Date: Tue Aug 10 15:53:41 2021 +0200
Branches: temp-geometry-nodes-fields-prototype
https://developer.blender.org/rBdf6a81998285d1c03f1b602654bdfd109887a06c
rename to Attribute Freeze
===================================================================
M release/scripts/startup/nodeitems_builtins.py
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/intern/node.cc
M source/blender/makesdna/DNA_node_types.h
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
R084 source/blender/nodes/geometry/nodes/node_geo_attribute_store_anonymous.cc source/blender/nodes/geometry/nodes/node_geo_attribute_freeze.cc
===================================================================
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index 7f766221fa0..a41e66c5d03 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -483,7 +483,7 @@ geometry_node_categories = [
NodeItem("GeometryNodeAttributeMapRange"),
NodeItem("GeometryNodeAttributeTransfer"),
NodeItem("GeometryNodeAttributeExtract"),
- NodeItem("GeometryNodeAttributeStore"),
+ NodeItem("GeometryNodeAttributeFreeze"),
]),
GeometryNodeCategory("GEO_COLOR", "Color", items=[
NodeItem("ShaderNodeRGBCurve"),
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index dbd2bbaec6c..20f9808b5a8 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1480,7 +1480,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
#define GEO_NODE_ATTRIBUTE 1075
#define GEO_NODE_INDEX 1076
#define GEO_NODE_EXTRUDE 1077
-#define GEO_NODE_ATTRIBUTE_STORE_ANONYMOUS 1078
+#define GEO_NODE_ATTRIBUTE_FREEZE 1078
#define GEO_NODE_ATTRIBUTE_EXTRACT 1079
#define GEO_NODE_NORMAL 1080
#define GEO_NODE_CURVE_PARAMETER 1081
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index aaaceab049e..5f9fa99e0ad 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -5198,7 +5198,7 @@ static void registerGeometryNodes()
register_node_type_geo_triangulate();
register_node_type_geo_viewer();
register_node_type_geo_volume_to_mesh();
- register_node_type_geo_attribute_store_anonymous();
+ register_node_type_geo_attribute_freeze();
}
static void registerFunctionNodes()
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 3c2c0d5d33d..fe0e178d759 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -1423,12 +1423,12 @@ typedef struct NodeGeometryRaycast {
uint8_t mapping;
} NodeGeometryRaycast;
-typedef struct NodeGeometryAttributeStore {
+typedef struct NodeGeometryAttributeFreeze {
/* CustomDataType. */
int8_t data_type;
/* AttributeDomain. */
int8_t domain;
-} NodeGeometryAttributeStore;
+} NodeGeometryAttributeFreeze;
typedef struct NodeGeometryAttribute {
/* eNodeSocketDatatype. */
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index c486057f1ed..04d8521a48f 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -9176,11 +9176,11 @@ static void def_geo_attribute_extract(StructRNA *srna)
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
}
-static void def_geo_attribute_store_anonymous(StructRNA *srna)
+static void def_geo_attribute_freeze(StructRNA *srna)
{
PropertyRNA *prop;
- RNA_def_struct_sdna_from(srna, "NodeGeometryAttributeStore", "storage");
+ RNA_def_struct_sdna_from(srna, "NodeGeometryAttributeFreeze", "storage");
prop = RNA_def_property(srna, "data_type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, rna_enum_attribute_type_items);
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index cb72ddfb75e..c1a940dff5b 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -141,7 +141,7 @@ set(SRC
function/nodes/node_fn_align_rotation_to_vector.cc
function/node_function_util.cc
- geometry/nodes/node_geo_attribute_store_anonymous.cc
+ geometry/nodes/node_geo_attribute_freeze.cc
geometry/nodes/node_geo_attribute.cc
geometry/nodes/node_geo_attribute_clamp.cc
geometry/nodes/node_geo_attribute_color_ramp.cc
diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h
index 46ec23b70ac..d609a8bcb0c 100644
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@ -31,7 +31,7 @@ void register_node_type_geo_custom_group(bNodeType *ntype);
void register_node_type_geo_extrude(void);
-void register_node_type_geo_attribute_store_anonymous(void);
+void register_node_type_geo_attribute_freeze(void);
void register_node_type_geo_attribute(void);
void register_node_type_geo_attribute_clamp(void);
void register_node_type_geo_attribute_color_ramp(void);
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index c71833817e8..96e084c06e9 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -353,7 +353,7 @@ DefNode(GeometryNode, GEO_NODE_TRANSFORM, 0, "TRANSFORM", Transform, "Transform"
DefNode(GeometryNode, GEO_NODE_TRIANGULATE, def_geo_triangulate, "TRIANGULATE", Triangulate, "Triangulate", "")
DefNode(GeometryNode, GEO_NODE_VIEWER, 0, "VIEWER", Viewer, "Viewer", "")
DefNode(GeometryNode, GEO_NODE_VOLUME_TO_MESH, def_geo_volume_to_mesh, "VOLUME_TO_MESH", VolumeToMesh, "Volume to Mesh", "")
-DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_STORE_ANONYMOUS, def_geo_attribute_store_anonymous, "ATTRIBUTE_STORE_ANONYMOUS", AttributeStore, "Store Attribute", "")
+DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_FREEZE, def_geo_attribute_freeze, "ATTRIBUTE_FREEZE", AttributeFreeze, "Attribute Freeze", "")
/* undefine macros */
#undef DefNode
diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_store_anonymous.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_freeze.cc
similarity index 84%
rename from source/blender/nodes/geometry/nodes/node_geo_attribute_store_anonymous.cc
rename to source/blender/nodes/geometry/nodes/node_geo_attribute_freeze.cc
index 346e3834048..4f4468d8860 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_store_anonymous.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_freeze.cc
@@ -19,7 +19,7 @@
#include "node_geometry_util.hh"
-static bNodeSocketTemplate geo_node_attribute_store_anonymous_in[] = {
+static bNodeSocketTemplate geo_node_attribute_freeze_in[] = {
{SOCK_GEOMETRY, N_("Geometry")},
{SOCK_VECTOR, N_("Value"), 0.0f, 0.0f, 0.0f, 0.0f, -FLT_MAX, FLT_MAX, PROP_NONE, SOCK_FIELD},
{SOCK_FLOAT, N_("Value"), 0.0f, 0.0f, 0.0f, 0.0f, -FLT_MAX, FLT_MAX, PROP_NONE, SOCK_FIELD},
@@ -29,7 +29,7 @@ static bNodeSocketTemplate geo_node_attribute_store_anonymous_in[] = {
{-1, ""},
};
-static bNodeSocketTemplate geo_node_attribute_store_anonymous_out[] = {
+static bNodeSocketTemplate geo_node_attribute_freeze_out[] = {
{SOCK_GEOMETRY, N_("Geometry")},
{SOCK_VECTOR, N_("Attribute"), 0.0f, 0.0f, 0.0f, 0.0f, -FLT_MAX, FLT_MAX},
{SOCK_FLOAT, N_("Attribute"), 0.0f, 0.0f, 0.0f, 0.0f, -FLT_MAX, FLT_MAX},
@@ -39,9 +39,9 @@ static bNodeSocketTemplate geo_node_attribute_store_anonymous_out[] = {
{-1, ""},
};
-static void geo_node_attribute_store_anonymous_layout(uiLayout *layout,
- bContext *UNUSED(C),
- PointerRNA *ptr)
+static void geo_node_attribute_freeze_layout(uiLayout *layout,
+ bContext *UNUSED(C),
+ PointerRNA *ptr)
{
uiLayoutSetPropSep(layout, true);
uiLayoutSetPropDecorate(layout, false);
@@ -49,19 +49,19 @@ static void geo_node_attribute_store_anonymous_layout(uiLayout *layout,
uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE);
}
-static void geo_node_attribute_store_anonymous_init(bNodeTree *UNUSED(tree), bNode *node)
+static void geo_node_attribute_freeze_init(bNodeTree *UNUSED(tree), bNode *node)
{
- NodeGeometryAttributeStore *data = (NodeGeometryAttributeStore *)MEM_callocN(
- sizeof(NodeGeometryAttributeStore), __func__);
+ NodeGeometryAttributeFreeze *data = (NodeGeometryAttributeFreeze *)MEM_callocN(
+ sizeof(NodeGeometryAttributeFreeze), __func__);
data->data_type = CD_PROP_FLOAT;
data->domain = ATTR_DOMAIN_POINT;
node->storage = data;
}
-static void geo_node_attribute_store_anonymous_update(bNodeTree *UNUSED(ntree), bNode *node)
+static void geo_node_attribute_freeze_update(bNodeTree *UNUSED(ntree), bNode *node)
{
- const NodeGeometryAttributeStore &storage = *(const NodeGeometryAttributeStore *)node->storage;
+ const NodeGeometryAttributeFreeze &storage = *(const NodeGeometryAttributeFreeze *)node->storage;
const CustomDataType data_type = static_cast<CustomDataType>(storage.data_type);
bNodeSocket *socket_value_attribute_name = (bNodeSocket *)node->inputs.first;
@@ -201,18 +201,18 @@ static void fill_anonymous(GeometryComponent &component,
attribute.save();
}
-static void geo_node_attribute_store_anonymous_exec(GeoNodeExecParams params)
+static void geo_node_attribute_freeze_exec(GeoNodeExecParams params)
{
GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry");
geometry_set = bke::geometry_set_realize_instances(geometry_set);
const bNode &node = params.node();
- const NodeGeometryAttributeStore &storage = *(const NodeGeometryAttributeStore *)node.storage;
+ const NodeGeometryAttributeFreeze &storage = *(const NodeGeometryAttributeFreeze *)node.storage;
const CustomDataType data_type = static_cast<CustomDataType>(storage.data_type);
const AttributeDomain domain = static_cast<AttributeDomain>(storage.domain);
- AnonymousCustomDataLayerID *id = CustomData_anonymous_id_new("Store Attribute");
+ AnonymousCustomDataLayerID *id = CustomData_anonymous_id_new("Attribute Freeze");
static const Array<GeometryComponentType> types = {
GEO_COMPONENT_TYPE_MESH, GEO_COMPONENT_TYPE_POINT_CLOUD, GEO_COMPONENT_TYPE_CURVE};
@@ -229,21 +229,20 @@ static void geo_node_attribute_store_anonymous_exec(GeoNodeExecParams params)
} // namespace blender::nodes
-void register_node_type_geo_attribute_store_anonymous()
+void register_node_type_geo_attribute_freeze()
{
static bNodeType ntype;
geo_node_type_base(
- &ntype, GEO_NODE_ATTRIBUTE_STORE_ANONYMOUS, "Store Attribute", NODE_CLASS_ATTRIBUTE, 0);
- node_type_socket_templates(
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list