diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-08-02 06:54:06 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-02 06:54:06 +0300 |
commit | 559e1434d847681a4e72144489b68fee650ab9a8 (patch) | |
tree | d91e78881de0e24c837c1a399d50aac3d5d397ff /source/blender/editors | |
parent | a4f55617d1ae803efa7266ae0a3746b79dfb1f3a (diff) |
parenthisize macro args to avoid errors
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_intern.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index bf3dece93d4..3163b54f0c2 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -2494,7 +2494,7 @@ static void curve_smooth_value(ListBase *editnurb, for (nu = editnurb->first; nu; nu = nu->next) { if (nu->bezt) { -#define BEZT_VALUE(bezt) (*((float *)((char *)bezt + bezt_offsetof))) +#define BEZT_VALUE(bezt) (*((float *)((char *)(bezt) + bezt_offsetof))) for (last_sel = 0; last_sel < nu->pntsu; last_sel++) { /* loop over selection segments of a curve, smooth each */ @@ -2563,7 +2563,7 @@ static void curve_smooth_value(ListBase *editnurb, #undef BEZT_VALUE } else if (nu->bp) { -#define BP_VALUE(bp) (*((float *)((char *)bp + bp_offset))) +#define BP_VALUE(bp) (*((float *)((char *)(bp) + bp_offset))) /* Same as above, keep these the same! */ for (last_sel = 0; last_sel < nu->pntsu; last_sel++) { diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 9461547a164..fc477d89ff4 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -164,7 +164,7 @@ extern const short ui_radial_dir_to_angle[8]; #define UI_BITBUT_SET(a, b) ( (a) | 1 << (b) ) #define UI_BITBUT_CLR(a, b) ( (a) & ~(1 << (b)) ) /* bit-row */ -#define UI_BITBUT_ROW(min, max) (((max) >= 31 ? 0xFFFFFFFF : (1 << (max + 1)) - 1) - ((min) ? ((1 << (min)) - 1) : 0) ) +#define UI_BITBUT_ROW(min, max) (((max) >= 31 ? 0xFFFFFFFF : (1 << ((max) + 1)) - 1) - ((min) ? ((1 << (min)) - 1) : 0) ) /* split numbuts by ':' and align l/r */ #define USE_NUMBUTS_LR_ALIGN |