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/editors | |
parent | 216ddcc09bde3e06cc35a97f0831a1a0df320a52 (diff) |
DNA: rename BezTriple alfa to tilt
Diffstat (limited to 'source/blender/editors')
-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 |
3 files changed, 23 insertions, 23 deletions
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); |