svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / editors / curve / editcurve.c
index 06d88b16fa8e3508144e5a5a73b64dd787e65cc1..bfca5453bc5974e988d27abbbe1da5ca784c0bf4 100644 (file)
@@ -6559,12 +6559,12 @@ static int curvesurf_prim_add(bContext *C, wmOperator *op, int type, int isSurf)
        ListBase *editnurb;
        Nurb *nu;
        int newob= 0;
-       int enter_editmode;
+       int enter_editmode, is_aligned;
        unsigned int layer;
        float loc[3], rot[3];
        float mat[4][4];
 
-       if(!ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer))
+       if(!ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, &is_aligned))
                return OPERATOR_CANCELLED;
 
        if (!isSurf) { /* adding curve */
@@ -6957,7 +6957,7 @@ static void *undo_check_lastsel(void *lastsel, Nurb *nu, Nurb *newnu)
        return NULL;
 }
 
-static void undoCurve_to_editCurve(void *ucu, void *obe)
+static void undoCurve_to_editCurve(void *ucu, void *UNUSED(edata), void *obe)
 {
        Object *obedit= obe;
        Curve *cu= (Curve*)obedit->data;
@@ -7007,10 +7007,9 @@ static void undoCurve_to_editCurve(void *ucu, void *obe)
        ED_curve_updateAnimPaths(obedit);
 }
 
-static void *editCurve_to_undoCurve(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;