[Bf-blender-cvs] [70bc179c454] master: refactor Collada: rename BCMatrix.* class files to BCMath.*
Gaia Clary
noreply at git.blender.org
Sun Jun 2 23:01:45 CEST 2019
Commit: 70bc179c45414bd426af49c883fcab1e3bebabf8
Author: Gaia Clary
Date: Tue May 28 09:20:45 2019 +0200
Branches: master
https://developer.blender.org/rB70bc179c45414bd426af49c883fcab1e3bebabf8
refactor Collada: rename BCMatrix.* class files to BCMath.*
===================================================================
R099 source/blender/collada/BCMatrix.cpp source/blender/collada/BCMath.cpp
R099 source/blender/collada/BCMatrix.h source/blender/collada/BCMath.h
M source/blender/collada/BCSampleData.h
M source/blender/collada/CMakeLists.txt
===================================================================
diff --git a/source/blender/collada/BCMatrix.cpp b/source/blender/collada/BCMath.cpp
similarity index 99%
rename from source/blender/collada/BCMatrix.cpp
rename to source/blender/collada/BCMath.cpp
index bcb4d1abab3..8d4a0778cc1 100644
--- a/source/blender/collada/BCMatrix.cpp
+++ b/source/blender/collada/BCMath.cpp
@@ -17,8 +17,7 @@
* All rights reserved.
*/
-#include "BCMatrix.h"
-#include "BLI_math.h"
+#include "BCMath.h"
#include "BlenderContext.h"
#include "collada_utils.h"
diff --git a/source/blender/collada/BCMatrix.h b/source/blender/collada/BCMath.h
similarity index 99%
rename from source/blender/collada/BCMatrix.h
rename to source/blender/collada/BCMath.h
index 63f84d2fd3d..2866e983689 100644
--- a/source/blender/collada/BCMatrix.h
+++ b/source/blender/collada/BCMath.h
@@ -22,8 +22,11 @@
#define __BCMATRIX_H__
#include "BlenderTypes.h"
+
+extern "C" {
#include "BKE_object.h"
#include "BLI_math.h"
+}
class BCQuat {
private:
diff --git a/source/blender/collada/BCSampleData.h b/source/blender/collada/BCSampleData.h
index 33b460d409c..c4e840ac3b3 100644
--- a/source/blender/collada/BCSampleData.h
+++ b/source/blender/collada/BCSampleData.h
@@ -26,7 +26,7 @@
#include "ExportSettings.h"
#include "BCSampleData.h"
-#include "BCMatrix.h"
+#include "BCMath.h"
extern "C" {
#include "BKE_object.h"
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt
index 857aea02dc9..5f28ca4ffbb 100644
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -63,7 +63,7 @@ set(SRC
ArmatureImporter.cpp
BCAnimationCurve.cpp
BCAnimationSampler.cpp
- BCMatrix.cpp
+ BCMath.cpp
BCSampleData.cpp
BlenderContext.cpp
CameraExporter.cpp
@@ -98,7 +98,7 @@ set(SRC
ArmatureImporter.h
BCAnimationCurve.h
BCAnimationSampler.h
- BCMatrix.h
+ BCMath.h
BCSampleData.h
BlenderContext.h
BlenderTypes.h
More information about the Bf-blender-cvs
mailing list