diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-17 18:21:27 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-17 18:21:27 +0400 |
commit | b805334cc283ea0126f81078830a3d6dcea97e40 (patch) | |
tree | 3e377ebd4e4ecd175e5aa891a796cd2beb1186ee /source/blender/editors/curve | |
parent | ddefb8a7d76890e285c3bbe62d7b60804c698280 (diff) |
fix [#29913] Bezier edit mode crashes on undo.
Diffstat (limited to 'source/blender/editors/curve')
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 9326e0cbf55..afaad2e7cb5 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -6857,10 +6857,9 @@ static void *undo_check_lastsel(void *lastsel, Nurb *nu, Nurb *newnu) return NULL; } -static void undoCurve_to_editCurve(void *ucu, void *UNUSED(edata), void *obe) +static void undoCurve_to_editCurve(void *ucu, void *UNUSED(edata), void *cu_v) { - Object *obedit= obe; - Curve *cu= (Curve*)obedit->data; + Curve *cu= cu_v; UndoCurve *undoCurve= ucu; ListBase *undobase= &undoCurve->nubase; ListBase *editbase= curve_editnurbs(cu); @@ -6903,13 +6902,15 @@ static void undoCurve_to_editCurve(void *ucu, void *UNUSED(edata), void *obe) cu->lastsel= lastsel; cu->actnu= undoCurve->actnu; - + /* BMESH_TODO */ +#if 0 ED_curve_updateAnimPaths(obedit); +#endif } -static void *editCurve_to_undoCurve(void *UNUSED(edata), void *obdata) +static void *editCurve_to_undoCurve(void *UNUSED(edata), void *cu_v) { - Curve *cu= obdata; + Curve *cu= cu_v; ListBase *nubase= curve_editnurbs(cu); UndoCurve *undoCurve; EditNurb *editnurb= cu->editnurb, tmpEditnurb; |