Merge branch 'master' into blender2.8

1 files changed, 21 insertions, 0 deletions

diff --git a/source/blender/makesrna/intern/rna_curve_api.c b/source/blender/makesrna/intern/rna_curve_api.c
index b0c07465958..dc1cbed824e 100644
--- a/source/blender/makesrna/intern/rna_curve_api.c
+++ b/source/blender/makesrna/intern/rna_curve_api.c
@@ -55,6 +55,11 @@ static void rna_Curve_update_gpu_tag(Curve *cu)
 	BKE_curve_batch_cache_dirty(cu, BKE_CURVE_BATCH_DIRTY_ALL);
 }
 
+static float rna_Nurb_calc_length(Nurb *nu, int resolution_u)
+{
+	return BKE_nurb_calc_length(nu, resolution_u);
+}
+
 #else
 
 void RNA_api_curve(StructRNA *srna)
@@ -77,4 +82,20 @@ void RNA_api_curve(StructRNA *srna)
 	RNA_def_function(srna, "update_gpu_tag", "rna_Curve_update_gpu_tag");
 }
 
+void RNA_api_curve_nurb(StructRNA *srna)
+{
+	FunctionRNA *func;
+	PropertyRNA *parm;
+
+	func = RNA_def_function(srna, "calc_length", "rna_Nurb_calc_length");
+	RNA_def_function_ui_description(func, "Calculate spline length");
+	RNA_def_int(
+	        func, "resolution", 0, 0, 1024, "Resolution",
+	        "Spline resolution to be used, 0 defaults to the resolution_u", 0, 64);
+	parm = RNA_def_float_distance(
+	        func, "length", 0.0f, 0.0f, FLT_MAX, "Length",
+	        "Length of the polygonaly approximated spline", 0.0f, FLT_MAX);
+	RNA_def_function_return(func, parm);
+}
+
 #endif