提交 1c7f48e9 编写于 作者: M Mr.doob

Updated builds.

上级 696794d7
......@@ -25737,7 +25737,7 @@ THREE.GeometryUtils = {
// Merge two geometries or geometry and geometry from object (using object's transform)
merge: function ( geometry1, object2 /* mesh | geometry */ ) {
merge: function ( geometry1, object2 /* mesh | geometry */, materialIndexOffset ) {
var matrix, normalMatrix,
vertexOffset = geometry1.vertices.length,
......@@ -25750,6 +25750,8 @@ THREE.GeometryUtils = {
uvs1 = geometry1.faceVertexUvs[ 0 ],
uvs2 = geometry2.faceVertexUvs[ 0 ];
if ( materialIndexOffset === undefined ) materialIndexOffset = 0;
if ( object2 instanceof THREE.Mesh ) {
object2.matrixAutoUpdate && object2.updateMatrix();
......@@ -25825,7 +25827,7 @@ THREE.GeometryUtils = {
}
faceCopy.materialIndex = face.materialIndex;
faceCopy.materialIndex = face.materialIndex + materialIndexOffset;
faceCopy.centroid.copy( face.centroid );
......
因为 它太大了无法显示 source diff 。你可以改为 查看blob
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册