1 files changed, 6 insertions, 35 deletions
diff --git a/source/blender/collada/BCSampleData.h b/source/blender/collada/BCSampleData.h
index 9cb56c95e0f..709bd3e59ef 100644
--- a/source/blender/collada/BCSampleData.h
+++ b/source/blender/collada/BCSampleData.h
@@ -24,6 +24,8 @@
 #include <map>
 #include <algorithm>
 
+#include "ExportSettings.h"
+
 extern "C" {
 #include "BKE_object.h"
 #include "BLI_math_rotation.h"
@@ -34,40 +36,6 @@ extern "C" {
 #include "DNA_camera_types.h"
 }
 
-typedef float(Matrix)[4][4];
-
-class BCMatrix {
-
- private:
-  mutable float matrix[4][4];
-  mutable float size[3];
-  mutable float rot[3];
-  mutable float loc[3];
-  mutable float q[4];
-
-  void unit();
-  void copy(Matrix &r, Matrix &a);
-  void set_transform(Object *ob);
-  void set_transform(Matrix &mat);
-
- public:
-  float (&location() const)[3];
-  float (&rotation() const)[3];
-  float (&scale() const)[3];
-  float (&quat() const)[4];
-
-  BCMatrix(Matrix &mat);
-  BCMatrix(Object *ob);
-
-  void get_matrix(double (&mat)[4][4],
-                  const bool transposed = false,
-                  const int precision = -1) const;
-
-  const bool in_range(const BCMatrix &other, float distance) const;
-  static void sanitize(Matrix &matrix, int precision);
-  static void transpose(Matrix &matrix);
-};
-
 typedef std::map<Bone *, BCMatrix *> BCBoneMatrixMap;
 
 class BCSample {
@@ -76,7 +44,10 @@ class BCSample {
   BCBoneMatrixMap bonemats; /* For Armature animation */
 
  public:
-  BCSample(Object *ob);
+  BCSample(Object *ob) : obmat(ob)
+  {
+  }
+
   ~BCSample();
 
   void add_bone_matrix(Bone *bone, Matrix &mat);