Mostly formatting commit, small elaboration in extra handling API (take pointer to importer).

1 files changed, 28 insertions, 25 deletions

diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/collada/DocumentImporter.h
index e312268c458..949185471f4 100644
--- a/source/blender/collada/DocumentImporter.h
+++ b/source/blender/collada/DocumentImporter.h
@@ -53,7 +53,7 @@ struct bContext;
 /** Importer class. */
 class DocumentImporter : COLLADAFW::IWriter
 {
- public:
+public:
 	//! Enumeration to denote the stage of import
 	enum ImportStage {
 		General,		//!< First pass to collect all data except controller
@@ -78,8 +78,8 @@ class DocumentImporter : COLLADAFW::IWriter
 	void translate_anim_recursive(COLLADAFW::Node*, COLLADAFW::Node*, Object*);
 
 	/** This method will be called if an error in the loading process occurred and the loader cannot
-	    continue to load. The writer should undo all operations that have been performed.
-            @param errorMessage A message containing informations about the error that occurred.
+	continue to load. The writer should undo all operations that have been performed.
+	@param errorMessage A message containing informations about the error that occurred.
 	*/
 	void cancel(const COLLADAFW::String& errorMessage);
 
@@ -88,7 +88,7 @@ class DocumentImporter : COLLADAFW::IWriter
 
 	/** This method is called after the last write* method. No other methods will be called after this.*/
 	void finish();
-	
+
 	bool writeGlobalAsset(const COLLADAFW::FileInfo*);
 
 	bool writeScene(const COLLADAFW::Scene*);
@@ -121,31 +121,34 @@ class DocumentImporter : COLLADAFW::IWriter
 
 	bool writeKinematicsScene(const COLLADAFW::KinematicsScene*);
 
- private:
- 
+	/** Add element and data for UniqueId */
+	bool addElementData(const COLLADAFW::UniqueId &uid);
+
+private:
+
 	/** Current import stage we're in. */
 	ImportStage mImportStage;
 	std::string mFilename;
 
-    bContext *mContext;
-
-    UnitConverter unit_converter;
-    ArmatureImporter armature_importer;
-    MeshImporter mesh_importer;
-    AnimationImporter anim_importer;
-
-    std::map<COLLADAFW::UniqueId, Image*> uid_image_map;
-    std::map<COLLADAFW::UniqueId, Material*> uid_material_map;
-    std::map<COLLADAFW::UniqueId, Material*> uid_effect_map;
-    std::map<COLLADAFW::UniqueId, Camera*> uid_camera_map;
-    std::map<COLLADAFW::UniqueId, Lamp*> uid_lamp_map;
-    std::map<Material*, TexIndexTextureArrayMap> material_texture_mapping_map;
-    std::map<COLLADAFW::UniqueId, Object*> object_map;
-    std::map<COLLADAFW::UniqueId, COLLADAFW::Node*> node_map;
-    std::vector<const COLLADAFW::VisualScene*> vscenes;
-    std::vector<Object*> libnode_ob;
-
-    std::map<COLLADAFW::UniqueId, COLLADAFW::Node*> root_map; // find root joint by child joint uid, for bone tree evaluation during resampling
+	bContext *mContext;
+
+	UnitConverter unit_converter;
+	ArmatureImporter armature_importer;
+	MeshImporter mesh_importer;
+	AnimationImporter anim_importer;
+
+	std::map<COLLADAFW::UniqueId, Image*> uid_image_map;
+	std::map<COLLADAFW::UniqueId, Material*> uid_material_map;
+	std::map<COLLADAFW::UniqueId, Material*> uid_effect_map;
+	std::map<COLLADAFW::UniqueId, Camera*> uid_camera_map;
+	std::map<COLLADAFW::UniqueId, Lamp*> uid_lamp_map;
+	std::map<Material*, TexIndexTextureArrayMap> material_texture_mapping_map;
+	std::map<COLLADAFW::UniqueId, Object*> object_map;
+	std::map<COLLADAFW::UniqueId, COLLADAFW::Node*> node_map;
+	std::vector<const COLLADAFW::VisualScene*> vscenes;
+	std::vector<Object*> libnode_ob;
+
+	std::map<COLLADAFW::UniqueId, COLLADAFW::Node*> root_map; // find root joint by child joint uid, for bone tree evaluation during resampling
 
 };