diff options
| -rw-r--r-- | source/blender/blenkernel/intern/curve.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/icons.c | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/BLI_heap.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_intern.h | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/raytrace/rayobject_octree.cpp | 3 |
6 files changed, 13 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index e769b4fce97..aa9e9567ecf 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -3116,8 +3116,8 @@ static void calchandleNurb_intern(BezTriple *bezt, BezTriple *prev, BezTriple *n bool is_fcurve, bool skip_align) { /* defines to avoid confusion */ -#define p2_h1 (p2 - 3) -#define p2_h2 (p2 + 3) +#define p2_h1 ((p2) - 3) +#define p2_h2 ((p2) + 3) float *p1, *p2, *p3, pt[3]; float dvec_a[3], dvec_b[3]; diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c index daf39116d76..7696249f2de 100644 --- a/source/blender/blenkernel/intern/icons.c +++ b/source/blender/blenkernel/intern/icons.c @@ -221,7 +221,7 @@ PreviewImage *BKE_previewimg_copy(PreviewImage *prv) PreviewImage **BKE_previewimg_id_get_p(ID *id) { switch (GS(id->name)) { -#define ID_PRV_CASE(id_code, id_struct) case id_code: { return &((id_struct *)id)->preview; } +#define ID_PRV_CASE(id_code, id_struct) case id_code: { return &((id_struct *)id)->preview; } ((void)0) ID_PRV_CASE(ID_MA, Material); ID_PRV_CASE(ID_TE, Tex); ID_PRV_CASE(ID_WO, World); diff --git a/source/blender/blenlib/intern/BLI_heap.c b/source/blender/blenlib/intern/BLI_heap.c index c0f338a1918..4bd404e5d73 100644 --- a/source/blender/blenlib/intern/BLI_heap.c +++ b/source/blender/blenlib/intern/BLI_heap.c @@ -54,13 +54,13 @@ struct Heap { /* internal functions */ -#define HEAP_PARENT(i) ((i - 1) >> 1) -#define HEAP_LEFT(i) ((i << 1) + 1) -#define HEAP_RIGHT(i) ((i << 1) + 2) -#define HEAP_COMPARE(a, b) (a->value < b->value) +#define HEAP_PARENT(i) (((i) - 1) >> 1) +#define HEAP_LEFT(i) (((i) << 1) + 1) +#define HEAP_RIGHT(i) (((i) << 1) + 2) +#define HEAP_COMPARE(a, b) ((a)->value < (b)->value) #if 0 /* UNUSED */ -#define HEAP_EQUALS(a, b) (a->value == b->value) +#define HEAP_EQUALS(a, b) ((a)->value == (b)->value) #endif BLI_INLINE void heap_swap(Heap *heap, const unsigned int i, const unsigned int j) 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 diff --git a/source/blender/render/intern/raytrace/rayobject_octree.cpp b/source/blender/render/intern/raytrace/rayobject_octree.cpp index 6cbb0761358..b21197e728d 100644 --- a/source/blender/render/intern/raytrace/rayobject_octree.cpp +++ b/source/blender/render/intern/raytrace/rayobject_octree.cpp @@ -119,7 +119,8 @@ static RayObjectAPI octree_api = /* within one octree node, a set of 3x15 bits defines a 'boundbox' to OR with */ #define OCVALRES 15 -#define BROW16(min, max) (((max) >= OCVALRES ? 0xFFFF : (1 << (max + 1)) - 1) - ((min > 0) ? ((1 << (min)) - 1) : 0)) +#define BROW16(min, max) \ + (((max) >= OCVALRES ? 0xFFFF : (1 << ((max) + 1)) - 1) - (((min) > 0) ? ((1 << (min)) - 1) : 0)) static void calc_ocval_face(float *v1, float *v2, float *v3, float *v4, short x, short y, short z, OcVal *ov) { |