diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-03 17:14:27 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-03 17:18:06 +0300 |
commit | 647c26c5ce77eb36ce37505bb8deaee2004f1f4c (patch) | |
tree | bde25eb01c56901511faff3356dd29bd063f8836 /source/blender | |
parent | 216ddcc09bde3e06cc35a97f0831a1a0df320a52 (diff) |
DNA: rename BezTriple alfa to tilt
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/anim.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 45 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/key.c | 8 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_250.c | 4 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 4 | ||||
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 30 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 8 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 8 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_curve_types.h | 24 | ||||
-rw-r--r-- | source/blender/makesdna/intern/dna_rename_defs.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_curve.c | 2 |
11 files changed, 73 insertions, 64 deletions
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 4e2e5403b37..df424ff9346 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -644,7 +644,7 @@ void calc_curvepath(Object *ob, ListBase *nurbs) } interp_v3_v3v3(pp->vec, bevp->vec, bevpn->vec, fac2); - pp->vec[3] = fac1 * bevp->alfa + fac2 * bevpn->alfa; + pp->vec[3] = fac1 * bevp->tilt + fac2 * bevpn->tilt; pp->radius = fac1 * bevp->radius + fac2 * bevpn->radius; pp->weight = fac1 * bevp->weight + fac2 * bevpn->weight; interp_qt_qtqt(pp->quat, bevp->quat, bevpn->quat, fac2); diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 83881b24750..2c6392fdf90 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1450,7 +1450,7 @@ void BKE_nurb_makeCurve( madd_v3_v3fl(coord_fp, bp->vec, *fp); if (tilt_fp) - (*tilt_fp) += (*fp) * bp->alfa; + (*tilt_fp) += (*fp) * bp->tilt; if (radius_fp) (*radius_fp) += (*fp) * bp->radius; @@ -2188,8 +2188,9 @@ static void calc_bevel_sin_cos(float x1, float y1, float x2, float y2, } -static void alfa_bezpart(BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float *tilt_array, float *radius_array, - float *weight_array, int resolu, int stride) +static void tilt_bezpart( + BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float *tilt_array, float *radius_array, + float *weight_array, int resolu, int stride) { BezTriple *pprev, *next, *last; float fac, dfac, t[4]; @@ -2226,12 +2227,12 @@ static void alfa_bezpart(BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float * for (a = 0; a < resolu; a++, fac += dfac) { if (tilt_array) { if (nu->tilt_interp == KEY_CU_EASE) { /* May as well support for tilt also 2.47 ease interp */ - *tilt_array = prevbezt->alfa + - (bezt->alfa - prevbezt->alfa) * (3.0f * fac * fac - 2.0f * fac * fac * fac); + *tilt_array = prevbezt->tilt + + (bezt->tilt - prevbezt->tilt) * (3.0f * fac * fac - 2.0f * fac * fac * fac); } else { key_curve_position_weights(fac, t, nu->tilt_interp); - *tilt_array = t[0] * pprev->alfa + t[1] * prevbezt->alfa + t[2] * bezt->alfa + t[3] * next->alfa; + *tilt_array = t[0] * pprev->tilt + t[1] * prevbezt->tilt + t[2] * bezt->tilt + t[3] * next->tilt; } tilt_array = POINTER_OFFSET(tilt_array, stride); @@ -2342,7 +2343,7 @@ static void bevel_list_apply_tilt(BevList *bl) nr = bl->nr; while (nr--) { - axis_angle_to_quat(q, bevp1->dir, bevp1->alfa); + axis_angle_to_quat(q, bevp1->dir, bevp1->tilt); mul_qt_qtqt(bevp1->quat, q, bevp1->quat); normalize_qt(bevp1->quat); @@ -2626,7 +2627,7 @@ static void make_bevel_list_segment_3D(BevList *bl) vec_to_quat(bevp1->quat, bevp1->dir, 5, 1); - axis_angle_to_quat(q, bevp1->dir, bevp1->alfa); + axis_angle_to_quat(q, bevp1->dir, bevp1->tilt); mul_qt_qtqt(bevp1->quat, q, bevp1->quat); normalize_qt(bevp1->quat); copy_v3_v3(bevp2->dir, bevp1->dir); @@ -2846,7 +2847,7 @@ void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render) while (len--) { copy_v3_v3(bevp->vec, bp->vec); - bevp->alfa = bp->alfa; + bevp->tilt = bp->tilt; bevp->radius = bp->radius; bevp->weight = bp->weight; bevp->split_tag = true; @@ -2914,7 +2915,7 @@ void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render) if (prevbezt->h2 == HD_VECT && bezt->h1 == HD_VECT) { copy_v3_v3(bevp->vec, prevbezt->vec[1]); - bevp->alfa = prevbezt->alfa; + bevp->tilt = prevbezt->tilt; bevp->radius = prevbezt->radius; bevp->weight = prevbezt->weight; bevp->split_tag = true; @@ -2943,8 +2944,8 @@ void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render) } /* if both arrays are NULL do nothiong */ - alfa_bezpart(prevbezt, bezt, nu, - do_tilt ? &bevp->alfa : NULL, + tilt_bezpart(prevbezt, bezt, nu, + do_tilt ? &bevp->tilt : NULL, do_radius ? &bevp->radius : NULL, do_weight ? &bevp->weight : NULL, resolu, sizeof(BevPoint)); @@ -2996,7 +2997,7 @@ void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render) if ((nu->flagu & CU_NURB_CYCLIC) == 0) { /* not cyclic: endpoint */ copy_v3_v3(bevp->vec, prevbezt->vec[1]); - bevp->alfa = prevbezt->alfa; + bevp->tilt = prevbezt->tilt; bevp->radius = prevbezt->radius; bevp->weight = prevbezt->weight; @@ -3027,7 +3028,7 @@ void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render) segbevcount = bl->segbevcount; BKE_nurb_makeCurve(nu, &bevp->vec[0], - do_tilt ? &bevp->alfa : NULL, + do_tilt ? &bevp->tilt : NULL, do_radius ? &bevp->radius : NULL, do_weight ? &bevp->weight : NULL, resolu, sizeof(BevPoint)); @@ -4480,11 +4481,11 @@ void BKE_nurb_direction_switch(Nurb *nu) if (bezt1 != bezt2) { SWAP(char, bezt2->h1, bezt2->h2); SWAP(char, bezt2->f1, bezt2->f3); - bezt1->alfa = -bezt1->alfa; - bezt2->alfa = -bezt2->alfa; + bezt1->tilt = -bezt1->tilt; + bezt2->tilt = -bezt2->tilt; } else { - bezt1->alfa = -bezt1->alfa; + bezt1->tilt = -bezt1->tilt; } a--; bezt1++; @@ -4499,8 +4500,8 @@ void BKE_nurb_direction_switch(Nurb *nu) while (bp1 != bp2 && a > 0) { SWAP(BPoint, *bp1, *bp2); a--; - bp1->alfa = -bp1->alfa; - bp2->alfa = -bp2->alfa; + bp1->tilt = -bp1->tilt; + bp2->tilt = -bp2->tilt; bp1++; bp2--; } @@ -4508,7 +4509,7 @@ void BKE_nurb_direction_switch(Nurb *nu) * but still need to change it's tilt. */ if (nu->pntsu & 1) { - bp1->alfa = -bp1->alfa; + bp1->tilt = -bp1->tilt; } if (nu->type == CU_NURBS) { /* no knots for too short paths */ @@ -4666,7 +4667,7 @@ void BKE_curve_nurbs_keyVertexTilts_apply(ListBase *lb, float *key) BezTriple *bezt = nu->bezt; for (i = 0; i < nu->pntsu; i++, bezt++) { - bezt->alfa = key[9]; + bezt->tilt = key[9]; bezt->radius = key[10]; key += KEYELEM_FLOAT_LEN_BEZTRIPLE; } @@ -4675,7 +4676,7 @@ void BKE_curve_nurbs_keyVertexTilts_apply(ListBase *lb, float *key) BPoint *bp = nu->bp; for (i = 0; i < nu->pntsu * nu->pntsv; i++, bp++) { - bp->alfa = key[3]; + bp->tilt = key[3]; bp->radius = key[4]; key += KEYELEM_FLOAT_LEN_BPOINT; } diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index f85f0052c61..f85964f76bc 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -1688,7 +1688,7 @@ void BKE_keyblock_update_from_curve(Curve *UNUSED(cu), KeyBlock *kb, ListBase *n for (int i = 0; i < 3; i++) { copy_v3_v3(&fp[i * 3], bezt->vec[i]); } - fp[9] = bezt->alfa; + fp[9] = bezt->tilt; fp[10] = bezt->radius; fp += KEYELEM_FLOAT_LEN_BEZTRIPLE; } @@ -1696,7 +1696,7 @@ void BKE_keyblock_update_from_curve(Curve *UNUSED(cu), KeyBlock *kb, ListBase *n else { for (a = nu->pntsu * nu->pntsv, bp = nu->bp; a; a--, bp++) { copy_v3_v3(fp, bp->vec); - fp[3] = bp->alfa; + fp[3] = bp->tilt; fp[4] = bp->radius; fp += KEYELEM_FLOAT_LEN_BPOINT; } @@ -1738,7 +1738,7 @@ void BKE_keyblock_convert_to_curve(KeyBlock *kb, Curve *UNUSED(cu), ListBase *nu for (int i = 0; i < 3; i++) { copy_v3_v3(bezt->vec[i], &fp[i * 3]); } - bezt->alfa = fp[9]; + bezt->tilt = fp[9]; bezt->radius = fp[10]; fp += KEYELEM_FLOAT_LEN_BEZTRIPLE; } @@ -1746,7 +1746,7 @@ void BKE_keyblock_convert_to_curve(KeyBlock *kb, Curve *UNUSED(cu), ListBase *nu else { for (a = nu->pntsu * nu->pntsv, bp = nu->bp; a && (tot -= KEYELEM_ELEM_LEN_BPOINT) >= 0; a--, bp++) { copy_v3_v3(bp->vec, fp); - bp->alfa = fp[3]; + bp->tilt = fp[3]; bp->radius = fp[4]; fp += KEYELEM_FLOAT_LEN_BPOINT; } diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index e894ef45b40..12495f5da18 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -979,7 +979,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) copy_v3_v3(bezt->vec[0], data); data += 3; copy_v3_v3(bezt->vec[1], data); data += 3; copy_v3_v3(bezt->vec[2], data); data += 3; - bezt->alfa = *data; data++; + bezt->tilt = *data; data++; } } else if (nu->bp) { @@ -987,7 +987,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) for (a = 0; a < nu->pntsu * nu->pntsv; a++, bp++) { copy_v3_v3(bp->vec, data); data += 3; - bp->alfa = *data; data++; + bp->tilt = *data; data++; } } } diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 89525cdde21..51f7da4f31a 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -792,7 +792,7 @@ void do_versions_after_linking_280(Main *bmain) for (int a = 0; a < nu->pntsu; a++, bezt++) { if ((old_count -= 3) < 0) { memcpy(newptr, bezt->vec, sizeof(float[3][3])); - newptr[3][0] = bezt->alfa; + newptr[3][0] = bezt->tilt; } else { memcpy(newptr, oldptr, sizeof(float[3][4])); @@ -810,7 +810,7 @@ void do_versions_after_linking_280(Main *bmain) for (int a = 0; a < nu->pntsu * nu->pntsv; a++, bp++) { if (--old_count < 0) { copy_v3_v3(newptr[0], bp->vec); - newptr[1][0] = bp->alfa; + newptr[1][0] = bp->tilt; } else { memcpy(newptr, oldptr, sizeof(float[4])); diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index d03532a27cd..a1595839980 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -535,14 +535,14 @@ static void key_to_bezt(float *key, BezTriple *basebezt, BezTriple *bezt) { memcpy(bezt, basebezt, sizeof(BezTriple)); memcpy(bezt->vec, key, sizeof(float) * 9); - bezt->alfa = key[9]; + bezt->tilt = key[9]; bezt->radius = key[10]; } static void bezt_to_key(BezTriple *bezt, float *key) { memcpy(key, bezt->vec, sizeof(float) * 9); - key[9] = bezt->alfa; + key[9] = bezt->tilt; key[10] = bezt->radius; } @@ -642,7 +642,7 @@ static void calc_shapeKeys(Object *obedit, ListBase *newnurbs) nu = editnurb->nurbs.first; while (nu) { if (nu->bezt) { - /* Three vects to store handles and one for alfa */ + /* Three vects to store handles and one for tilt. */ totvec += nu->pntsu * 4; } else { @@ -668,7 +668,7 @@ static void calc_shapeKeys(Object *obedit, ListBase *newnurbs) sub_v3_v3v3(ofs[i], bezt->vec[j], oldbezt->vec[j]); i++; } - ofs[i][0] = bezt->alfa - oldbezt->alfa; + ofs[i][0] = bezt->tilt - oldbezt->tilt; ofs[i][1] = bezt->radius - oldbezt->radius; i++; } @@ -685,7 +685,7 @@ static void calc_shapeKeys(Object *obedit, ListBase *newnurbs) oldbp = getKeyIndexOrig_bp(editnurb, bp); if (oldbp) { sub_v3_v3v3(ofs[i], bp->vec, oldbp->vec); - ofs[i + 1][0] = bp->alfa - oldbp->alfa; + ofs[i + 1][0] = bp->tilt - oldbp->tilt; ofs[i + 1][1] = bp->radius - oldbp->radius; } i += 2; @@ -730,11 +730,11 @@ static void calc_shapeKeys(Object *obedit, ListBase *newnurbs) copy_v3_v3(newbezt->vec[j], oldbezt->vec[j]); } } - fp[9] = bezt->alfa; + fp[9] = bezt->tilt; fp[10] = bezt->radius; if (restore && oldbezt) { - newbezt->alfa = oldbezt->alfa; + newbezt->tilt = oldbezt->tilt; newbezt->radius = oldbezt->radius; } @@ -753,12 +753,12 @@ static void calc_shapeKeys(Object *obedit, ListBase *newnurbs) copy_v3_v3(fp, bp->vec); - fp[3] = bp->alfa; + fp[3] = bp->tilt; fp[4] = bp->radius; if (restore && oldbp) { copy_v3_v3(newbp->vec, oldbp->vec); - newbp->alfa = oldbp->alfa; + newbp->tilt = oldbp->tilt; newbp->radius = oldbp->radius; } @@ -795,7 +795,7 @@ static void calc_shapeKeys(Object *obedit, ListBase *newnurbs) fp[10] = curofp[10]; if (apply_offset) { - /* apply alfa offsets */ + /* Apply tilt offsets. */ add_v3_v3(fp + 9, ofs[i]); i++; } @@ -807,7 +807,7 @@ static void calc_shapeKeys(Object *obedit, ListBase *newnurbs) for (j = 0; j < 3; j++, i++) { copy_v3_v3(&fp[j * 3], bezt->vec[j]); } - fp[9] = bezt->alfa; + fp[9] = bezt->tilt; fp[10] = bezt->radius; fp += KEYELEM_FLOAT_LEN_BEZTRIPLE; @@ -834,7 +834,7 @@ static void calc_shapeKeys(Object *obedit, ListBase *newnurbs) } else { copy_v3_v3(fp, bp->vec); - fp[3] = bp->alfa; + fp[3] = bp->tilt; fp[4] = bp->radius; } @@ -2926,7 +2926,7 @@ static int curve_smooth_tilt_exec(bContext *C, wmOperator *UNUSED(op)) Object *obedit = CTX_data_edit_object(C); ListBase *editnurb = object_editcurve_get(obedit); - curve_smooth_value(editnurb, offsetof(BezTriple, alfa), offsetof(BPoint, alfa)); + curve_smooth_value(editnurb, offsetof(BezTriple, tilt), offsetof(BPoint, tilt)); WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data); DEG_id_tag_update(obedit->data, 0); @@ -6595,7 +6595,7 @@ static int clear_tilt_exec(bContext *C, wmOperator *UNUSED(op)) bezt = nu->bezt; a = nu->pntsu; while (a--) { - if (BEZT_ISSEL_ANY_HIDDENHANDLES(v3d, bezt)) bezt->alfa = 0.0; + if (BEZT_ISSEL_ANY_HIDDENHANDLES(v3d, bezt)) bezt->tilt = 0.0; bezt++; } } @@ -6603,7 +6603,7 @@ static int clear_tilt_exec(bContext *C, wmOperator *UNUSED(op)) bp = nu->bp; a = nu->pntsu * nu->pntsv; while (a--) { - if (bp->f1 & SELECT) bp->alfa = 0.0f; + if (bp->f1 & SELECT) bp->tilt = 0.0f; bp++; } } diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 175e0eb6c4f..706215f8fae 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -293,7 +293,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float tot++; median->weight += bezt->weight; median->radius += bezt->radius; - median->tilt += bezt->alfa; + median->tilt += bezt->tilt; if (!totcurvedata) { /* I.e. first time... */ selp = bezt; seltype = &RNA_BezierSplinePoint; @@ -324,7 +324,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float tot++; median->weight += bp->weight; median->radius += bp->radius; - median->tilt += bp->alfa; + median->tilt += bp->tilt; if (!totcurvedata) { /* I.e. first time... */ selp = bp; seltype = &RNA_SplinePoint; @@ -698,7 +698,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float apply_raw_diff(&bezt->radius, tot, ve_median->radius, median->radius); } if (median->tilt) { - apply_raw_diff(&bezt->alfa, tot, ve_median->tilt, median->tilt); + apply_raw_diff(&bezt->tilt, tot, ve_median->tilt, median->tilt); } } else if (apply_vcos) { @@ -728,7 +728,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float apply_raw_diff(&bp->radius, tot, ve_median->radius, median->radius); } if (median->tilt) { - apply_raw_diff(&bp->alfa, tot, ve_median->tilt, median->tilt); + apply_raw_diff(&bp->tilt, tot, ve_median->tilt, median->tilt); } } } diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 7dc934b4cc3..fdc9993d105 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1887,8 +1887,8 @@ static void createTransCurveVerts(TransInfo *t) td->ival = bezt->radius; } else if (t->mode == TFM_TILT) { - td->val = &(bezt->alfa); - td->ival = bezt->alfa; + td->val = &(bezt->tilt); + td->ival = bezt->tilt; } else { td->val = NULL; @@ -1998,8 +1998,8 @@ static void createTransCurveVerts(TransInfo *t) td->ival = bp->radius; } else { - td->val = &(bp->alfa); - td->ival = bp->alfa; + td->val = &(bp->tilt); + td->ival = bp->tilt; } copy_m3_m3(td->smtx, smtx); diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 5d1404028dc..d432209575b 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -64,7 +64,7 @@ typedef struct Path { # # typedef struct BevPoint { - float vec[3], alfa, radius, weight, offset; + float vec[3], tilt, radius, weight, offset; /** 2D Only. */ float sina, cosa; /** 3D Only. */ @@ -87,9 +87,9 @@ typedef struct BevList { /** * Keyframes on F-Curves (allows code reuse of Bezier eval code) and - * Points on Bezier Curves/Paths are generally BezTriples + * Points on Bezier Curves/Paths are generally BezTriples. * - * \note alfa location in struct is abused by Key system + * \note #BezTriple.tilt location in struct is abused by Key system. * * \note vec in BezTriple looks like this: * - vec[0][0] = x location of handle 1 @@ -104,8 +104,12 @@ typedef struct BevList { */ typedef struct BezTriple { float vec[3][3]; - /** Alfa: tilt in 3D View, weight: used for softbody goal weight, radius: for bevel tapering. */ - float alfa, weight, radius; + /** Tilt in 3D View. */ + float tilt; + /** Used for softbody goal weight. */ + float weight; + /** For bevel tapering & modifiers. */ + float radius; /** Ipo: interpolation mode for segment from this BezTriple to the next. */ char ipo; @@ -131,11 +135,15 @@ typedef struct BezTriple { char _pad[3]; } BezTriple; -/* note; alfa location in struct is abused by Key system */ +/** + * \note #BPoint.tilt location in struct is abused by Key system. + */ typedef struct BPoint { float vec[4]; - /** Alfa: tilt in 3D View, weight: used for softbody goal weight. */ - float alfa, weight; + /** Tilt in 3D View. */ + float tilt; + /** Used for softbody goal weight. */ + float weight; /** F1: selection status, hide: is point hidden or not. */ short f1, hide; /** User-set radius per point for beveling etc. */ diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h index 6c3b65ee861..e1fa1e29f96 100644 --- a/source/blender/makesdna/intern/dna_rename_defs.h +++ b/source/blender/makesdna/intern/dna_rename_defs.h @@ -55,6 +55,8 @@ DNA_STRUCT_RENAME(Lamp, Light) DNA_STRUCT_RENAME(SpaceButs, SpaceProperties) DNA_STRUCT_RENAME(SpaceIpo, SpaceGraph) DNA_STRUCT_RENAME(SpaceOops, SpaceOutliner) +DNA_STRUCT_RENAME_ELEM(BPoint, alfa, tilt) +DNA_STRUCT_RENAME_ELEM(BezTriple, alfa, tilt) DNA_STRUCT_RENAME_ELEM(Camera, YF_dofdist, dof_distance) DNA_STRUCT_RENAME_ELEM(Camera, clipend, clip_end) DNA_STRUCT_RENAME_ELEM(Camera, clipsta, clip_start) diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 79af46fd38e..ae3b8304d7b 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -783,7 +783,6 @@ static void rna_def_bpoint(BlenderRNA *brna) /* Number values */ prop = RNA_def_property(srna, "tilt", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "alfa"); RNA_def_property_range(prop, -tilt_limit, tilt_limit); RNA_def_property_ui_range(prop, -tilt_limit, tilt_limit, 10, 3); RNA_def_property_ui_text(prop, "Tilt", "Tilt in 3D View"); @@ -871,7 +870,6 @@ static void rna_def_beztriple(BlenderRNA *brna) /* Number values */ prop = RNA_def_property(srna, "tilt", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "alfa"); RNA_def_property_range(prop, -tilt_limit, tilt_limit); RNA_def_property_ui_range(prop, -tilt_limit, tilt_limit, 10, 3); RNA_def_property_ui_text(prop, "Tilt", "Tilt in 3D View"); |