merge from master

1 files changed, 1 insertions, 4 deletions

diff --git a/source/blender/collada/SceneExporter.h b/source/blender/collada/SceneExporter.h
index ded48983bd9..3e3c15b836f 100644
--- a/source/blender/collada/SceneExporter.h
+++ b/source/blender/collada/SceneExporter.h
@@ -96,12 +96,9 @@ class SceneExporter: COLLADASW::LibraryVisualScenes, protected TransformWriter,
 {
 public:
 	SceneExporter(COLLADASW::StreamWriter *sw, ArmatureExporter *arm, const ExportSettings *export_settings);
-	void exportScene(const struct EvaluationContext *eval_ctx, Scene *sce);
-	void setExportTransformationType(BC_export_transformation_type transformation_type);
+	void exportScene(const EvaluationContext *eval_ctx, Scene *sce);
 
 private:
-	BC_export_transformation_type transformation_type;
-	// required for writeNodes() for bone-parented objects
 	friend class ArmatureExporter;
 	void exportHierarchy(const struct EvaluationContext *eval_ctx, Scene *sce);
 	void writeNodes(const struct EvaluationContext *eval_ctx, Object *ob, Scene *sce);