diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-17 08:59:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-17 08:59:14 +0400 |
| commit | 1ff373ef5bb0c1462ad8b0f30cfb773e30cbb2bb (patch) | |
| tree | b6ec7b01b644cc8c0d4d743a4d3d94551b59f2b1 /source/blender/editors/space_view3d/view3d_snap.c | |
| parent | 594b0298c7a672fca44890d3afd1e5bf4f06c1da (diff) | |
| parent | 2636be0ac0d3139b2c9cf54f6380b2e9a3d3ed51 (diff) | |
svn merge -r40166:40279 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_snap.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_snap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index ad10c703b80..a843c67849b 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -68,7 +68,7 @@ #include "ED_armature.h" #include "ED_mesh.h" #include "ED_screen.h" -#include "ED_curve.h" /* for ED_curve_editnurbs */ +#include "ED_curve.h" /* for curve_editnurbs */ #include "view3d_intern.h" @@ -105,7 +105,7 @@ static void special_transvert_update(Object *obedit) } else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) { Curve *cu= obedit->data; - ListBase *nurbs= ED_curve_editnurbs(cu); + ListBase *nurbs= curve_editnurbs(cu); Nurb *nu= nurbs->first; while(nu) { @@ -363,7 +363,7 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode) else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) { Curve *cu= obedit->data; int totmalloc= 0; - ListBase *nurbs= ED_curve_editnurbs(cu); + ListBase *nurbs= curve_editnurbs(cu); for(nu= nurbs->first; nu; nu= nu->next) { if(nu->type == CU_BEZIER) |