[Bf-blender-cvs] [fd07e493ea9] collada: Cleanup: Collada removed unneeded methods from Animation Exporter

[Gaia Clary]

Commit: fd07e493ea97cf43738c5a6ac50a095cfb56926e
Author: Gaia Clary
Date:   Sat Mar 24 18:44:48 2018 +0100
Branches: collada
https://developer.blender.org/rBfd07e493ea97cf43738c5a6ac50a095cfb56926e

Cleanup: Collada removed unneeded methods from Animation Exporter

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

M	source/blender/collada/BCAnimationCurveContainer.cpp
M	source/blender/collada/BCAnimationCurveContainer.h
M	source/blender/collada/BCSampleData.h

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

diff --git a/source/blender/collada/BCAnimationCurveContainer.cpp b/source/blender/collada/BCAnimationCurveContainer.cpp
index 229912a2eb8..777c293d04a 100644
--- a/source/blender/collada/BCAnimationCurveContainer.cpp
+++ b/source/blender/collada/BCAnimationCurveContainer.cpp
@@ -653,11 +653,11 @@ const BCSample &BCSampleFrame::get_sample(Object *ob, Bone *bone) const
 }
 
 /* Get the matrix for the given Bone, returns Unity when the Objewct is not sampled */
-const BCSample &BCSampleFrame::get_sample(Object *ob, Material *mat) const
-{
-	const BCSampleKey key(ob, mat);
-	return get_sample(key);
-}
+//const BCSample &BCSampleFrame::get_sample(Object *ob, Material *mat) const
+//{
+//	const BCSampleKey key(ob, mat);
+//	return get_sample(key);
+//}
 
 /* Check if the key is in this BCSampleFrame */
 const bool BCSampleFrame::contains(const BCSampleKey &key) const
@@ -679,12 +679,12 @@ const bool BCSampleFrame::contains(Object *ob, Bone *bone) const
 	return contains(key);
 }
 
-/* Check if the Bone is in this BCSampleFrame */
-const bool BCSampleFrame::contains(Object *ob, Material *mat) const
-{
-	const BCSampleKey key(ob, mat);
-	return contains(key);
-}
+///* Check if the Bone is in this BCSampleFrame */
+//const bool BCSampleFrame::contains(Object *ob, Material *mat) const
+//{
+//	const BCSampleKey key(ob, mat);
+//	return contains(key);
+//}
 
 /* Return the BCSampleMap for this BCSampleFrame */
 const BCSampleKeysMap &BCSampleFrame::get_samples() const
diff --git a/source/blender/collada/BCAnimationCurveContainer.h b/source/blender/collada/BCAnimationCurveContainer.h
index 465b15d6c24..b57b0f477d8 100644
--- a/source/blender/collada/BCAnimationCurveContainer.h
+++ b/source/blender/collada/BCAnimationCurveContainer.h
@@ -88,7 +88,7 @@ public:
 	const BCSample &get_sample(const BCSampleKey key) const;
 	const BCSample &get_sample(Object *ob) const;
 	const BCSample &get_sample(Object *ob, Bone *bone) const;
-	const BCSample &get_sample(Object *ob, Material *mat) const;
+	//const BCSample &get_sample(Object *ob, Material *mat) const;
 
 	/* Check if the key is in this BCSampleFrame */
 	/* Check if the Object is in this BCSampleFrame */
@@ -97,7 +97,7 @@ public:
 	const bool contains(const BCSampleKey &key) const;
 	const bool contains(Object *ob) const;
 	const bool contains(Object *ob, Bone *bone) const;
-	const bool contains(Object *ob, Material *mat) const;
+	//const bool contains(Object *ob, Material *mat) const;
 
 	/* Return the BCSampleMap for this BCSampleFrame */
 	const BCSampleKeysMap &get_samples() const;
diff --git a/source/blender/collada/BCSampleData.h b/source/blender/collada/BCSampleData.h
index eb28ba6025a..08740693a0f 100644
--- a/source/blender/collada/BCSampleData.h
+++ b/source/blender/collada/BCSampleData.h
@@ -103,10 +103,10 @@ public:
 		this->key = std::string(ob->id.name) + ".pose.bones[" + std::string(bone->name) + "]";
 	}
 
-	BCSampleKey(const Object *ob, Material *ma)
-	{
-		this->key = std::string(ob->id.name) + ".material[" + std::string(ma->id.name) + "]";
-	}
+	//BCSampleKey(const Object *ob, Material *ma)
+	//{
+	//	this->key = std::string(ob->id.name) + ".material[" + std::string(ma->id.name) + "]";
+	//}
 
 	const bool operator<(const BCSampleKey &other) const
 	{