Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-03-22 11:56:06 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-03-22 11:56:06 +0300
commit6f07673ce457740558906f156691db84d4c89999 (patch)
treebdf6b4736e9c4e9189ec95a243207ca21ad9a54f
parent150dee260ea0850b681f9c4523918d2000a3890e (diff)
Fix compilation error
Recent fix was assuming some cleanup is done.
-rw-r--r--source/blender/editors/armature/armature_edit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c
index 605754b76db..9e762e00719 100644
--- a/source/blender/editors/armature/armature_edit.c
+++ b/source/blender/editors/armature/armature_edit.c
@@ -44,6 +44,7 @@
#include "BLI_math.h"
#include "BLI_ghash.h"
+#include "BKE_utildefines.h"
#include "BKE_action.h"
#include "BKE_armature.h"
#include "BKE_constraint.h"
@@ -1456,7 +1457,7 @@ static int armature_dissolve_selected_exec(bContext *C, wmOperator *UNUSED(op))
if (ebone->flag & BONE_DONE) {
copy_v3_v3(ebone->parent->tail, ebone->tail);
ebone->parent->rad_tail = ebone->rad_tail;
- SET_FLAG_FROM_TEST(ebone->parent->flag, ebone->flag & BONE_TIPSEL, BONE_TIPSEL);
+ BKE_BIT_TEST_SET(ebone->parent->flag, ebone->flag & BONE_TIPSEL, BONE_TIPSEL);
ED_armature_edit_bone_remove_ex(arm, ebone, false);
changed = true;