Merge pull request mrdoob#7323 from ruofeidu/patch-1

mrdoob · mrdoob · commit 9f5f6bae9966 · 2015-10-13T00:26:25.000-04:00
Fix null pointer err for some collada models
diff --git a/src/objects/SkinnedMesh.js b/src/objects/SkinnedMesh.js
@@ -43,7 +43,7 @@ THREE.SkinnedMesh = function ( geometry, material, useVertexTexture ) {
 
 			gbone = this.geometry.bones[ b ];
 
-			if ( gbone.parent !== - 1 ) {
+			if ( gbone.parent !== - 1 && gbone.parent !== null) {
 
 				bones[ gbone.parent ].add( bones[ b ] );
 
