Parcourir la source

Merge remote-tracking branch 'remotes/mrdoob/dev' into unflip

alteredq il y a 13 ans
Parent
commit
e8c139e84a

+ 1 - 1
examples/webgl_loader_collada.html

@@ -51,7 +51,7 @@
 
 			var loader = new THREE.ColladaLoader();
 			loader.options.convertUpAxis = true;
-			loader.load( './models/collada/monster/monster.dae', function colladaReady( collada ) {
+			loader.load( './models/collada/monster/monster.dae', function ( collada ) {
 
 				dae = collada.scene;
 				skin = collada.skins[ 0 ];

+ 1 - 1
examples/webgl_loader_json_blender.html

@@ -59,7 +59,7 @@
 
 			var loader = new THREE.ColladaLoader();
 			loader.options.convertUpAxis = true;
-			loader.load( 'models/collada/monster/monster.dae', function colladaReady( collada ) {
+			loader.load( 'models/collada/monster/monster.dae', function ( collada ) {
 
 				dae = collada.scene;
 				skin = collada.skins[ 0 ];

+ 2 - 1
src/core/Vertex.js

@@ -2,8 +2,9 @@
  * @author mr.doob / http://mrdoob.com/
  */
 
-THREE.Vertex = function () {
+THREE.Vertex = function ( v ) {
 
 	console.warn( 'THREE.Vertex has been DEPRECATED. Use THREE.Vector3 instead.')
+	return v;
 
 };