diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2019-05-28 10:20:45 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2019-06-03 00:00:56 +0300 |
| commit | 70bc179c45414bd426af49c883fcab1e3bebabf8 (patch) | |
| tree | 56f1941be8381ae2954b4165272f6e5bde69ae0a /source/blender/collada | |
| parent | e17990bab75fd922bd0d497d7d6c8a25e9bf63fd (diff) | |
refactor Collada: rename BCMatrix.* class files to BCMath.*
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/BCMath.cpp (renamed from source/blender/collada/BCMatrix.cpp) | 3 | ||||
| -rw-r--r-- | source/blender/collada/BCMath.h (renamed from source/blender/collada/BCMatrix.h) | 3 | ||||
| -rw-r--r-- | source/blender/collada/BCSampleData.h | 2 | ||||
| -rw-r--r-- | source/blender/collada/CMakeLists.txt | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/collada/BCMatrix.cpp b/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 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 |