diff options
author | Joseph Eagar <joeedh@gmail.com> | 2011-05-17 00:55:15 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2011-05-17 00:55:15 +0400 |
commit | 2a12e8b7e4a08fb57e72de5ce62d61b698828f84 (patch) | |
tree | eea487e47a1c5499b83796e13d98a760fb21a1d8 /source/blender | |
parent | 16710fb3c21f1e405fee58640f3e68f2e1fa6251 (diff) |
=bmesh= fixed curve editmode crash
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 2 | ||||
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 20d7db78019..bbc99d09ad7 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -27,7 +27,7 @@ type name (e.g. edges). for double-type slots, use the two type names plus for output slots, for single-type geometry slots, use the type name plus "out", (e.g. vertout), for double-type slots, use the two type names plus "out", (e.g. vertfaceout), for three-type slots, use geom. note that you can also -use more esohteric names (e.g. skirtout) do long as the comment next to the +use more esohteric names (e.g. skirtout) so long as the comment next to the slot definition tells you what types of elements are in it. */ diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index ddd20e2f0e0..ffcbad8229c 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -7006,10 +7006,9 @@ static void undoCurve_to_editCurve(void *ucu, void *UNUSED(edata), void *obe) ED_curve_updateAnimPaths(obedit); } -static void *editCurve_to_undoCurve(void *UNUSED(edata), void *obe) +static void *editCurve_to_undoCurve(void *UNUSED(edata), void *obdata) { - Object *obedit= obe; - Curve *cu= (Curve*)obedit->data; + Curve *cu= obdata; ListBase *nubase= ED_curve_editnurbs(cu); UndoCurve *undoCurve; EditNurb *editnurb= cu->editnurb, tmpEditnurb; |