diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-04-29 20:05:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-29 20:06:42 +0300 |
| commit | fbd172a00aed4546d3b4cbd0711a5ce94a4ee1b2 (patch) | |
| tree | 7990613cb6083b86470ec3f8436b6a454f949c10 /source/blender/editors/curve | |
| parent | b0a72c98bb1abbfe0dc62b29dc538fb0d90a9f4a (diff) | |
| parent | 0fbce637b3dba02bf1f496d0e902b317793915fc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/curve')
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 9e3344914bb..1dd32d6b1a2 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -5852,6 +5852,7 @@ static int curve_dissolve_exec(bContext *C, wmOperator *UNUSED(op)) BLI_assert(points_stride + dims == points + (points_len * dims)); float tan_l[3], tan_r[3], error_sq_dummy; + unsigned int error_index_dummy; sub_v3_v3v3(tan_l, bezt_prev->vec[1], bezt_prev->vec[2]); normalize_v3(tan_l); @@ -5862,7 +5863,7 @@ static int curve_dissolve_exec(bContext *C, wmOperator *UNUSED(op)) points, points_len, NULL, dims, FLT_EPSILON, tan_l, tan_r, bezt_prev->vec[2], bezt_next->vec[0], - &error_sq_dummy); + &error_sq_dummy, &error_index_dummy); if (!ELEM(bezt_prev->h2, HD_FREE, HD_ALIGN)) { bezt_prev->h2 = (bezt_prev->h2 == HD_VECT) ? HD_FREE : HD_ALIGN; |