diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-20 12:45:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-20 12:45:03 +0300 |
| commit | a8777f905846f80385fc90135e000c3169bbefc6 (patch) | |
| tree | 928a7db22a8553abd35f99a0afe2990be87d69ac /source/blender/makesrna/intern/rna_wm_manipulator.c | |
| parent | c0c696b014e3c21b923a2c21fb33a18839a3faa3 (diff) | |
| parent | 65af15ad887b30e678db9acab75efc7897c9197e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm_manipulator.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm_manipulator.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_wm_manipulator.c b/source/blender/makesrna/intern/rna_wm_manipulator.c index a8dcd563ed3..00705456fc7 100644 --- a/source/blender/makesrna/intern/rna_wm_manipulator.c +++ b/source/blender/makesrna/intern/rna_wm_manipulator.c @@ -62,7 +62,6 @@ #include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_workspace.h" -#include "BKE_utildefines.h" #include "MEM_guardedalloc.h" @@ -354,7 +353,7 @@ static int rna_Manipulator_##func_id##_get(PointerRNA *ptr) \ static void rna_Manipulator_##func_id##_set(PointerRNA *ptr, int value) \ { \ wmManipulator *mpr = ptr->data; \ - BKE_BIT_TEST_SET(mpr->member_id, value, flag_value); \ + SET_FLAG_FROM_TEST(mpr->member_id, value, flag_value); \ } /* wmManipulator.flag (negative) */ @@ -367,7 +366,7 @@ static int rna_Manipulator_##func_id##_get(PointerRNA *ptr) \ static void rna_Manipulator_##func_id##_set(PointerRNA *ptr, int value) \ { \ wmManipulator *mpr = ptr->data; \ - BKE_BIT_TEST_SET(mpr->member_id, !value, flag_value); \ + SET_FLAG_FROM_TEST(mpr->member_id, !value, flag_value); \ } #define RNA_MANIPULATOR_FLAG_RO_DEF(func_id, member_id, flag_value) \ |