diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_nodetree.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 55 |
1 files changed, 54 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index c26e9e883d6..c927c7df6bd 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -374,7 +374,7 @@ const EnumPropertyItem rna_enum_node_clamp_items[] = { static const EnumPropertyItem rna_enum_node_tex_dimensions_items[] = { {1, "1D", 0, "1D", "Use the scalar value W as input"}, {2, "2D", 0, "2D", "Use the 2D vector (x, y) as input. The z component is ignored"}, - {3, "3D", 0, "3D", "Use the 3D vector Vector as input"}, + {3, "3D", 0, "3D", "Use the 3D vector (x, y, z) as input"}, {4, "4D", 0, "4D", "Use the 4D vector (x, y, z, w) as input"}, {0, NULL, 0, NULL, NULL}, }; @@ -8967,6 +8967,33 @@ static void def_geo_boolean(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); } +static void def_geo_curve_primitive_bezier_segment(StructRNA *srna) +{ + static const EnumPropertyItem mode_items[] = { + + {GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT_POSITION, + "POSITION", + ICON_NONE, + "Position", + "The start and end handles are fixed positions"}, + {GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT_OFFSET, + "OFFSET", + ICON_NONE, + "Offset", + "The start and end handles are offsets from the spline's control points"}, + {0, NULL, 0, NULL, NULL}, + }; + + PropertyRNA *prop; + + RNA_def_struct_sdna_from(srna, "NodeGeometryCurvePrimitiveBezierSegment", "storage"); + + prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, mode_items); + RNA_def_property_ui_text(prop, "Mode", "Method used to determine control handles"); + RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); +} + static void def_geo_triangulate(StructRNA *srna) { PropertyRNA *prop; @@ -9398,6 +9425,32 @@ static void def_geo_attribute_vector_rotate(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); } +static void def_geo_curve_primitive_circle(StructRNA *srna) +{ + static const EnumPropertyItem mode_items[] = { + {GEO_NODE_CURVE_PRIMITIVE_CIRCLE_TYPE_POINTS, + "POINTS", + ICON_NONE, + "Points", + "Define the radius and location with three points"}, + {GEO_NODE_CURVE_PRIMITIVE_CIRCLE_TYPE_RADIUS, + "RADIUS", + ICON_NONE, + "Radius", + "Define the radius with a float"}, + {0, NULL, 0, NULL, NULL}, + }; + + PropertyRNA *prop; + + RNA_def_struct_sdna_from(srna, "NodeGeometryCurvePrimitiveCircle", "storage"); + + prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, mode_items); + RNA_def_property_ui_text(prop, "Mode", "Method used to determine radius and placement"); + RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); +} + static void def_geo_point_rotate(StructRNA *srna) { static const EnumPropertyItem type_items[] = { |