[Bf-blender-cvs] [66109b20593] collada: Refactor Collada: Renamed files to better match class names:

Gaia Clary noreply at git.blender.org
Fri Mar 30 18:40:49 CEST 2018


Commit: 66109b2059302f600622a194a92ed5ae00198624
Author: Gaia Clary
Date:   Fri Mar 30 17:42:31 2018 +0200
Branches: collada
https://developer.blender.org/rB66109b2059302f600622a194a92ed5ae00198624

Refactor Collada: Renamed files to better match class names:

* Renamed files:
  old names: BCAnimationCurveContainer.*
  new names: BCAnimationSampler.*

* Adjusted the include files to the new names

===================================================================

M	source/blender/collada/AnimationExporter.cpp
M	source/blender/collada/AnimationExporter.h
R099	source/blender/collada/BCAnimationCurveContainer.cpp	source/blender/collada/BCAnimationSampler.cpp
R100	source/blender/collada/BCAnimationCurveContainer.h	source/blender/collada/BCAnimationSampler.h
M	source/blender/collada/CMakeLists.txt

===================================================================

diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index 8e613ebd024..a04a0595c3c 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -23,7 +23,7 @@
 #include "GeometryExporter.h"
 #include "AnimationExporter.h"
 #include "AnimationClipExporter.h"
-#include "BCAnimationCurveContainer.h"
+#include "BCAnimationSampler.h"
 #include "MaterialExporter.h"
 #include "collada_utils.h"
 
diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h
index b5bac35df2d..a28691d7d6b 100644
--- a/source/blender/collada/AnimationExporter.h
+++ b/source/blender/collada/AnimationExporter.h
@@ -77,7 +77,7 @@ extern "C"
 #include "COLLADASWBaseInputElement.h"
 
 #include "EffectExporter.h"
-#include "BCAnimationCurveContainer.h"
+#include "BCAnimationSampler.h"
 #include "collada_internal.h"
 
 #include "IK_solver.h"
diff --git a/source/blender/collada/BCAnimationCurveContainer.cpp b/source/blender/collada/BCAnimationSampler.cpp
similarity index 99%
rename from source/blender/collada/BCAnimationCurveContainer.cpp
rename to source/blender/collada/BCAnimationSampler.cpp
index 05ee5d97e18..29ac792221b 100644
--- a/source/blender/collada/BCAnimationCurveContainer.cpp
+++ b/source/blender/collada/BCAnimationSampler.cpp
@@ -29,7 +29,7 @@
 
 #include "ExportSettings.h"
 #include "BCAnimationCurve.h"
-#include "BCAnimationCurveContainer.h"
+#include "BCAnimationSampler.h"
 
 extern "C" {
 #include "BKE_action.h"
diff --git a/source/blender/collada/BCAnimationCurveContainer.h b/source/blender/collada/BCAnimationSampler.h
similarity index 100%
rename from source/blender/collada/BCAnimationCurveContainer.h
rename to source/blender/collada/BCAnimationSampler.h
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt
index 14a9587f7e3..c82f252c4cf 100644
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -52,7 +52,7 @@ set(SRC
 	ArmatureExporter.cpp
 	ArmatureImporter.cpp
 	BCAnimationCurve.cpp
-	BCAnimationCurveContainer.cpp
+	BCAnimationSampler.cpp
 	BCSampleData.cpp
 	CameraExporter.cpp
 	ControllerExporter.cpp
@@ -84,7 +84,7 @@ set(SRC
 	ArmatureExporter.h
 	ArmatureImporter.h
 	BCAnimationCurve.h
-	BCAnimationCurveContainer.h
+	BCAnimationSampler.h
 	BCSampleData.h
 	CameraExporter.h
 	ControllerExporter.h



More information about the Bf-blender-cvs mailing list