1 files changed, 53 insertions, 10 deletions

diff --git a/source/blender/makesrna/intern/rna_curves.c b/source/blender/makesrna/intern/rna_curves.c
index cb8b36f41d2..a01a2bcb8cd 100644
--- a/source/blender/makesrna/intern/rna_curves.c
+++ b/source/blender/makesrna/intern/rna_curves.c
@@ -26,6 +26,12 @@ const EnumPropertyItem rna_enum_curves_types[] = {
     {0, NULL, 0, NULL, NULL},
 };
 
+const EnumPropertyItem rna_enum_curve_normal_modes[] = {
+    {NORMAL_MODE_MINIMUM_TWIST, "MINIMUM_TWIST", ICON_NONE, "Minimum Twist", ""},
+    {NORMAL_MODE_Z_UP, "Z_UP", ICON_NONE, "Z Up", ""},
+    {0, NULL, 0, NULL, NULL},
+};
+
 #ifdef RNA_RUNTIME
 
 #  include "BLI_math_vector.h"
@@ -60,12 +66,23 @@ static void rna_Curves_curve_offset_data_begin(CollectionPropertyIterator *iter,
                            NULL);
 }
 
+static float (*get_curves_positions(Curves *curves))[3]
+{
+  return (float(*)[3])CustomData_get_layer_named(
+      &curves->geometry.point_data, CD_PROP_FLOAT3, "position");
+}
+
+static const float (*get_curves_positions_const(const Curves *curves))[3]
+{
+  return (const float(*)[3])CustomData_get_layer_named(
+      &curves->geometry.point_data, CD_PROP_FLOAT3, "position");
+}
+
 static int rna_CurvePoint_index_get_const(const PointerRNA *ptr)
 {
   const Curves *curves = rna_curves(ptr);
   const float(*co)[3] = ptr->data;
-  const float(*positions)[3] = (const float(*)[3])CustomData_get_layer_named(
-      &curves->geometry.point_data, CD_PROP_FLOAT3, "position");
+  const float(*positions)[3] = get_curves_positions_const(curves);
   return (int)(co - positions);
 }
 
@@ -75,13 +92,27 @@ static int rna_Curves_position_data_length(PointerRNA *ptr)
   return curves->geometry.point_num;
 }
 
+int rna_Curves_position_data_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
+{
+  Curves *curves = rna_curves(ptr);
+  if (index < 0 || index >= curves->geometry.point_num) {
+    return false;
+  }
+  r_ptr->owner_id = &curves->id;
+  r_ptr->type = &RNA_FloatVectorAttributeValue;
+  r_ptr->data = &get_curves_positions(curves)[index];
+  return true;
+}
+
 static void rna_Curves_position_data_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
-  const Curves *curves = rna_curves(ptr);
-  const float(*positions)[3] = (const float(*)[3])CustomData_get_layer_named(
-      &curves->geometry.point_data, CD_PROP_FLOAT3, "position");
-  rna_iterator_array_begin(
-      iter, (void *)positions, sizeof(float[3]), curves->geometry.point_num, false, NULL);
+  Curves *curves = rna_curves(ptr);
+  rna_iterator_array_begin(iter,
+                           get_curves_positions(curves),
+                           sizeof(float[3]),
+                           curves->geometry.point_num,
+                           false,
+                           NULL);
 }
 
 static int rna_CurvePoint_index_get(PointerRNA *ptr)
@@ -126,6 +157,18 @@ static char *rna_CurvePoint_path(const PointerRNA *ptr)
   return BLI_sprintfN("points[%d]", rna_CurvePoint_index_get_const(ptr));
 }
 
+int rna_Curves_points_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
+{
+  Curves *curves = rna_curves(ptr);
+  if (index < 0 || index >= curves->geometry.point_num) {
+    return false;
+  }
+  r_ptr->owner_id = &curves->id;
+  r_ptr->type = &RNA_CurvePoint;
+  r_ptr->data = &get_curves_positions(curves)[index];
+  return true;
+}
+
 static int rna_CurveSlice_index_get_const(const PointerRNA *ptr)
 {
   Curves *curves = rna_curves(ptr);
@@ -195,7 +238,7 @@ static void rna_def_curves_point(BlenderRNA *brna)
   PropertyRNA *prop;
 
   srna = RNA_def_struct(brna, "CurvePoint", NULL);
-  RNA_def_struct_ui_text(srna, "Curve Point", "Curve curve control point");
+  RNA_def_struct_ui_text(srna, "Curve Point", "Curve control point");
   RNA_def_struct_path_func(srna, "rna_CurvePoint_path");
 
   prop = RNA_def_property(srna, "position", PROP_FLOAT, PROP_TRANSLATION);
@@ -280,7 +323,7 @@ static void rna_def_curves(BlenderRNA *brna)
                                     "rna_iterator_array_end",
                                     "rna_iterator_array_get",
                                     "rna_Curves_position_data_length",
-                                    NULL,
+                                    "rna_Curves_points_lookup_int",
                                     NULL,
                                     NULL);
   RNA_def_property_ui_text(prop, "Points", "Control points of all curves");
@@ -295,7 +338,7 @@ static void rna_def_curves(BlenderRNA *brna)
                                     "rna_iterator_array_end",
                                     "rna_iterator_array_get",
                                     "rna_Curves_position_data_length",
-                                    NULL,
+                                    "rna_Curves_position_data_lookup_int",
                                     NULL,
                                     NULL);
   RNA_def_property_struct_type(prop, "FloatVectorAttributeValue");