From 6e67d8e3bb392f26bcd99d39763e8b25e72d118f Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Mon, 30 Apr 2018 18:46:52 +0200 Subject: Cleanup: Move FOREACH_PCHAN_*_IN_OBJECT_*() macros to BKE_armature.h This reduces the number of headers we need to import (and/or dependencies on the order of them), as these depend on PBONE_VISIBLE(), which is already in BKE_armature.h --- source/blender/blenkernel/BKE_action.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'source/blender/blenkernel/BKE_action.h') diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h index e42a37cd444..72a8ffd7a26 100644 --- a/source/blender/blenkernel/BKE_action.h +++ b/source/blender/blenkernel/BKE_action.h @@ -208,21 +208,6 @@ void BKE_pose_rest(struct bPose *pose); /* Tag pose for recalc. Also tag all related data to be recalc. */ void BKE_pose_tag_recalc(struct Main *bmain, struct bPose *pose); -/* context.selected_pose_bones */ -#define FOREACH_PCHAN_SELECTED_IN_OBJECT_BEGIN(_ob, _pchan) \ - for (bPoseChannel *_pchan = (_ob)->pose->chanbase.first; _pchan; _pchan = _pchan->next) { \ - if (PBONE_VISIBLE(((bArmature *)(_ob)->data), (_pchan)->bone) && ((_pchan)->bone->flag & BONE_SELECTED)) { -#define FOREACH_PCHAN_SELECTED_IN_OBJECT_END \ - } \ - } ((void)0) -/* context.visible_pose_bones */ -#define FOREACH_PCHAN_VISIBLE_IN_OBJECT_BEGIN(_ob, _pchan) \ - for (bPoseChannel *_pchan = (_ob)->pose->chanbase.first; _pchan; _pchan = _pchan->next) { \ - if (PBONE_VISIBLE(((bArmature *)(_ob)->data), (_pchan)->bone)) { -#define FOREACH_PCHAN_VISIBLE_IN_OBJECT_END \ - } \ - } ((void)0) - #ifdef __cplusplus }; -- cgit v1.2.3