浏览代码

Fix the vertexData merge when one operator is null or undefined

David Catuhe 8 年之前
父节点
当前提交
9c41353359

文件差异内容过多而无法显示
+ 2576 - 2576
dist/preview release/babylon.d.ts


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/babylon.js


+ 1 - 1
dist/preview release/babylon.max.js

@@ -27161,7 +27161,7 @@ var BABYLON;
                 return this._mergeElement(source, new Float32Array(source.length));
                 return this._mergeElement(source, new Float32Array(source.length));
             }
             }
             if (!source) {
             if (!source) {
-                return this._mergeElement(new Float32Array(other.length), other);
+                return other;
             }
             }
             var len = other.length + source.length;
             var len = other.length + source.length;
             var isSrcTypedArray = source instanceof Float32Array;
             var isSrcTypedArray = source instanceof Float32Array;

文件差异内容过多而无法显示
+ 2576 - 2576
dist/preview release/babylon.module.d.ts


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/babylon.worker.js


文件差异内容过多而无法显示
+ 2988 - 2988
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js


+ 1 - 1
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js

@@ -27161,7 +27161,7 @@ var BABYLON;
                 return this._mergeElement(source, new Float32Array(source.length));
                 return this._mergeElement(source, new Float32Array(source.length));
             }
             }
             if (!source) {
             if (!source) {
-                return this._mergeElement(new Float32Array(other.length), other);
+                return other;
             }
             }
             var len = other.length + source.length;
             var len = other.length + source.length;
             var isSrcTypedArray = source instanceof Float32Array;
             var isSrcTypedArray = source instanceof Float32Array;

文件差异内容过多而无法显示
+ 2988 - 2988
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.module.d.ts


+ 1 - 1
src/Mesh/babylon.mesh.vertexData.ts

@@ -334,7 +334,7 @@
             }
             }
 
 
             if (!source) {
             if (!source) {
-                return this._mergeElement(new Float32Array(other.length), other);
+                return other;
             }
             }
 
 
             var len = other.length + source.length;
             var len = other.length + source.length;