refactor: Collada reorganize class constructors

- Class constructors without body (only attribute initialisations)
  can safely be kept in the class header files

- Constructor variables should be initialized in the order of their
  definition in the header files

This change is also aimed to remove a couple of
build warnings from the linux builds.

1 files changed, 10 insertions, 3 deletions

diff --git a/source/blender/collada/ArmatureExporter.h b/source/blender/collada/ArmatureExporter.h
index 977a8b9b4a5..1a8080ad613 100644
--- a/source/blender/collada/ArmatureExporter.h
+++ b/source/blender/collada/ArmatureExporter.h
@@ -57,7 +57,15 @@ class SceneExporter;
 class ArmatureExporter : public COLLADASW::LibraryControllers, protected TransformWriter, protected InstanceWriter
 {
 public:
-	ArmatureExporter(BlenderContext &blender_context, COLLADASW::StreamWriter *sw, const ExportSettings *export_settings);
+
+	// XXX exporter writes wrong data for shared armatures.  A separate
+	// controller should be written for each armature-mesh binding how do
+	// we make controller ids then?
+	ArmatureExporter(BlenderContext &blender_context, COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) :
+		COLLADASW::LibraryControllers(sw),
+		blender_context(blender_context),
+		export_settings(export_settings)
+	{}
 
 	void add_armature_bones(
 		Object *ob_arm,
@@ -68,9 +76,8 @@ public:
 	bool add_instance_controller(Object *ob);
 
 private:
-	UnitConverter converter;
-	const ExportSettings *export_settings;
 	BlenderContext &blender_context;
+	const ExportSettings *export_settings;
 
 #if 0
 	std::vector<Object *> written_armatures;