Merge remote-tracking branch 'jihoonl/master' into dev

examples/js/loaders/ColladaLoader.js

@@ -47,7 +47,6 @@ THREE.ColladaLoader = function () {
 
 	};
 
-	// TODO: support unit conversion as well
 	var colladaUnit = 1.0;
 	var colladaUp = 'Y';
 	var upConversion = null;
@@ -847,6 +846,10 @@ THREE.ColladaLoader = function () {
 		obj.useQuaternion = true;
 		obj.scale = props[ 2 ];
 
+    // unit conversion
+    obj.position.multiplyScalar(colladaUnit);
+    obj.scale.multiplyScalar(colladaUnit);
+
 		if ( options.centerGeometry && obj.geometry ) {
 
 			var delta = THREE.GeometryUtils.center( obj.geometry );