From 6f07673ce457740558906f156691db84d4c89999 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Thu, 22 Mar 2018 09:56:06 +0100
Subject: [PATCH] Fix compilation error
Recent fix was assuming some cleanup is done.
---
source/blender/editors/armature/armature_edit.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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;
--
GitLab