From f4484daed341f879b9cd6b16e4ffa809ccf3d81c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 9 Jul 2014 07:52:06 +1000 Subject: [PATCH] Correct IS_EMPTY macro also prevent reading from BM_ELEM_API_FLAG_ get/setters --- source/blender/blenlib/BLI_linklist_stack.h | 2 +- source/blender/bmesh/intern/bmesh_private.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/blender/blenlib/BLI_linklist_stack.h b/source/blender/blenlib/BLI_linklist_stack.h index d3d1924628c..84e7130a962 100644 --- a/source/blender/blenlib/BLI_linklist_stack.h +++ b/source/blender/blenlib/BLI_linklist_stack.h @@ -160,7 +160,7 @@ _##var##_stack->link : NULL)) #define BLI_SMALLSTACK_IS_EMPTY(var) \ - (_BLI_SMALLSTACK_CAST(var) (_##var##_stack != NULL)) + ((_BLI_SMALLSTACK_CAST(var) _##var##_stack) == NULL) /* loop over stack members last-added-first */ #define BLI_SMALLSTACK_ITER_BEGIN(var, item) \ diff --git a/source/blender/bmesh/intern/bmesh_private.h b/source/blender/bmesh/intern/bmesh_private.h index cac4713c8b2..731c36437d5 100644 --- a/source/blender/bmesh/intern/bmesh_private.h +++ b/source/blender/bmesh/intern/bmesh_private.h @@ -67,10 +67,10 @@ enum { _FLAG_OVERLAP = (1 << 2) /* general overlap flag */ }; -#define BM_ELEM_API_FLAG_ENABLE(element, f) ((element)->head.api_flag |= (f)) -#define BM_ELEM_API_FLAG_DISABLE(element, f) ((element)->head.api_flag &= ~(f)) -#define BM_ELEM_API_FLAG_TEST(element, f) ((element)->head.api_flag & (f)) -#define BM_ELEM_API_FLAG_CLEAR(element) ((element)->head.api_flag = 0) +#define BM_ELEM_API_FLAG_ENABLE(element, f) { ((element)->head.api_flag |= (f)); } (void)0 +#define BM_ELEM_API_FLAG_DISABLE(element, f) { ((element)->head.api_flag &= ~(f)); } (void)0 +#define BM_ELEM_API_FLAG_TEST(element, f) ((element)->head.api_flag & (f)) +#define BM_ELEM_API_FLAG_CLEAR(element) { ((element)->head.api_flag = 0); } (void)0 void poly_rotate_plane(const float normal[3], float (*verts)[3], unsigned const int nverts);