From 5fc992e76aeeedf1955c9d7c561fb8b7c8a398a5 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 2 Oct 2020 15:36:42 +0200 Subject: Cleanup: Move `EditBone` structure definition from `ED` to `BKE` area. Access to this structure will be needed in BKE's armature code. --- source/blender/io/collada/collada_internal.cpp | 3 ++- source/blender/io/collada/collada_utils.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'source/blender/io/collada') diff --git a/source/blender/io/collada/collada_internal.cpp b/source/blender/io/collada/collada_internal.cpp index b3fa9ba1251..66810685979 100644 --- a/source/blender/io/collada/collada_internal.cpp +++ b/source/blender/io/collada/collada_internal.cpp @@ -23,7 +23,8 @@ #include "collada_utils.h" #include "BLI_linklist.h" -#include "ED_armature.h" + +#include "BKE_armature.h" UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP) { diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp index 294087ab062..1ed11507ee6 100644 --- a/source/blender/io/collada/collada_utils.cpp +++ b/source/blender/io/collada/collada_utils.cpp @@ -44,6 +44,7 @@ #include "BLI_math.h" #include "BKE_action.h" +#include "BKE_armature.h" #include "BKE_constraint.h" #include "BKE_context.h" #include "BKE_customdata.h" @@ -58,7 +59,6 @@ #include "BKE_object.h" #include "BKE_scene.h" -#include "ED_armature.h" #include "ED_node.h" #include "ED_object.h" #include "ED_screen.h" -- cgit v1.2.3