Merge branch 'master' into dev

examples/js/loaders/ColladaLoader.js

@@ -151,6 +151,10 @@ THREE.ColladaLoader = function () {
 
 		}
 
+		// unit conversion
+		scene.position.multiplyScalar( colladaUnit );
+		scene.scale.multiplyScalar( colladaUnit );
+
 		createAnimations();
 
 		var result = {
@@ -846,10 +850,6 @@ 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 );
@@ -3114,9 +3114,8 @@ THREE.ColladaLoader = function () {
 
 							var samplerId = cot.texture;
 							var surfaceId = this.effect.sampler[samplerId].source;
-              
 
-							if (surfaceId) {
+							if ( surfaceId ) {
 
 								var surface = this.effect.surface[surfaceId];
 								var image = images[surface.init_from];