COLLADA

Import unit_settings to scene.

Note: I use here RNA to do this, and I think I might slowly work on replacing low-level DNA usage with RNA where possible.

1 files changed, 11 insertions, 3 deletions

diff --git a/source/blender/collada/collada_internal.h b/source/blender/collada/collada_internal.h
index 1e3546263da..72b03a3d090 100644
--- a/source/blender/collada/collada_internal.h
+++ b/source/blender/collada/collada_internal.h
@@ -43,14 +43,22 @@ private:
 
 public:
 
+	enum UnitSystem {
+		None,
+		Metric,
+		Imperial
+	};
+
 	// Initialize with Z_UP, since Blender uses right-handed, z-up
 	UnitConverter();
 
 	void read_asset(const COLLADAFW::FileInfo* asset);
 
-	// TODO
-	// convert vector vec from COLLADA format to Blender
-	void convertVec3(float *vec);
+	void convertVector3(COLLADABU::Math::Vector3 &vec, float *v);
+	
+	UnitConverter::UnitSystem isMetricSystem(void);
+	
+	float getLinearMeter(void);
 		
 	// TODO need also for angle conversion, time conversion...