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:
authorBastien Montagne <bastien@blender.org>2020-10-02 16:36:42 +0300
committerBastien Montagne <bastien@blender.org>2020-10-02 18:40:51 +0300
commit5fc992e76aeeedf1955c9d7c561fb8b7c8a398a5 (patch)
tree676240546671a8f8ce179cb1a8b86f569c1db65c /source/blender/io/collada
parente3b49bb850018ae73088b8d4e7c195206f8b2f31 (diff)
Cleanup: Move `EditBone` structure definition from `ED` to `BKE` area.
Access to this structure will be needed in BKE's armature code.
Diffstat (limited to 'source/blender/io/collada')
-rw-r--r--source/blender/io/collada/collada_internal.cpp3
-rw-r--r--source/blender/io/collada/collada_utils.cpp2
2 files changed, 3 insertions, 2 deletions
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"