diff options
Diffstat (limited to 'source/blender/editors/curve/editcurve.c')
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index e2d15897233..d780429784f 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -107,7 +107,7 @@ void selectend_nurb(Object *obedit, short selfirst, short doswap, short selstatu static void select_adjacent_cp(ListBase *editnurb, short next, short cont, short selstatus); /* still need to eradicate a few :( */ -#define callocstructN(x, y, name) (x *)MEM_callocN((y) * sizeof(x), name) +#define CALLOC_STRUCT_N(x, y, name) (x *)MEM_callocN((y) * sizeof(x), name) static float nurbcircle[8][2] = { {0.0, -1.0}, {-1.0, -1.0}, {-1.0, 0.0}, {-1.0, 1.0}, @@ -6265,7 +6265,7 @@ Nurb *add_nurbs_primitive(bContext *C, float mat[4][4], int type, int newob) nu->pntsu = 4; nu->pntsv = 1; nu->orderu = 4; - nu->bp = callocstructN(BPoint, 4, "addNurbprim3"); + nu->bp = CALLOC_STRUCT_N(BPoint, 4, "addNurbprim3"); bp = nu->bp; for (a = 0; a < 4; a++, bp++) { @@ -6301,7 +6301,7 @@ Nurb *add_nurbs_primitive(bContext *C, float mat[4][4], int type, int newob) nu->orderu = 5; nu->flagu = CU_NURB_ENDPOINT; /* endpoint */ nu->resolu = cu->resolu; - nu->bp = callocstructN(BPoint, 5, "addNurbprim3"); + nu->bp = CALLOC_STRUCT_N(BPoint, 5, "addNurbprim3"); bp = nu->bp; for (a = 0; a < 5; a++, bp++) { @@ -6334,7 +6334,7 @@ Nurb *add_nurbs_primitive(bContext *C, float mat[4][4], int type, int newob) if (cutype == CU_BEZIER) { if (!force_3d) nu->flag |= CU_2D; nu->pntsu = 4; - nu->bezt = callocstructN(BezTriple, 4, "addNurbprim1"); + nu->bezt = CALLOC_STRUCT_N(BezTriple, 4, "addNurbprim1"); nu->flagu = CU_NURB_CYCLIC; bezt = nu->bezt; @@ -6371,7 +6371,7 @@ Nurb *add_nurbs_primitive(bContext *C, float mat[4][4], int type, int newob) nu->pntsu = 8; nu->pntsv = 1; nu->orderu = 4; - nu->bp = callocstructN(BPoint, 8, "addNurbprim6"); + nu->bp = CALLOC_STRUCT_N(BPoint, 8, "addNurbprim6"); nu->flagu = CU_NURB_CYCLIC; bp = nu->bp; @@ -6404,7 +6404,7 @@ Nurb *add_nurbs_primitive(bContext *C, float mat[4][4], int type, int newob) nu->orderu = 4; nu->orderv = 4; nu->flag = CU_SMOOTH; - nu->bp = callocstructN(BPoint, 4 * 4, "addNurbprim6"); + nu->bp = CALLOC_STRUCT_N(BPoint, 4 * 4, "addNurbprim6"); nu->flagu = 0; nu->flagv = 0; bp = nu->bp; @@ -6471,7 +6471,7 @@ Nurb *add_nurbs_primitive(bContext *C, float mat[4][4], int type, int newob) nu->resolu = cu->resolu; nu->resolv = cu->resolv; nu->flag = CU_SMOOTH; - nu->bp = callocstructN(BPoint, 5, "addNurbprim6"); + nu->bp = CALLOC_STRUCT_N(BPoint, 5, "addNurbprim6"); nu->flagu = 0; bp = nu->bp; |