From eaf815f14a928f7d99db93013c9ad8daae539094 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 26 May 2014 09:11:42 +1000 Subject: Fix for curve having invalid active vertex after setting type also allow passing NULL vertex to BKE_curve_nurb_vert_active_set --- source/blender/makesrna/intern/rna_curve.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source/blender/makesrna/intern/rna_curve.c') diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 79c19c4c246..29f1dd5f29f 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -323,8 +323,15 @@ static int rna_Nurb_length(PointerRNA *ptr) static void rna_Nurb_type_set(PointerRNA *ptr, int value) { + Curve *cu = (Curve *)ptr->id.data; Nurb *nu = (Nurb *)ptr->data; - BKE_nurb_type_convert(nu, value, true); + const int pntsu_prev = nu->pntsu; + + if (BKE_nurb_type_convert(nu, value, true)) { + if (nu->pntsu != pntsu_prev) { + cu->actvert = CU_ACT_NONE; + } + } } static void rna_BPoint_array_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) -- cgit v1.2.3