@babylonjs/core 5.0.3 → 5.2.0

package/Meshes/mesh.d.ts

@@ -970,12 +970,12 @@ export declare class Mesh extends AbstractMesh implements IGetSetVerticesData {
      * Prepare internal position array for software CPU skinning
      * @returns original positions used for CPU skinning. Useful for integrating Morphing with skeletons in same mesh
      */
-    setPositionsForCPUSkinning(): Float32Array;
+    setPositionsForCPUSkinning(): Nullable<Float32Array>;
     /**
      * Prepare internal normal array for software CPU skinning
      * @returns original normals used for CPU skinning. Useful for integrating Morphing with skeletons in same mesh.
      */
-    setNormalsForCPUSkinning(): Float32Array;
+    setNormalsForCPUSkinning(): Nullable<Float32Array>;
     /**
      * Updates the vertex buffer by applying transformation from the bones
      * @param skeleton defines the skeleton to apply to current mesh

package/Meshes/mesh.js

@@ -349,10 +349,12 @@ var Mesh = /** @class */ (function (_super) {
             }
             if (value && this._internalMeshDataInfo._sourcePositions) {
                 // switch from software to GPU computation: we need to reset the vertex and normal buffers that have been updated by the software process
-                this.setVerticesData(VertexBuffer.PositionKind, this._internalMeshDataInfo._sourcePositions.slice(), true);
+                this.setVerticesData(VertexBuffer.PositionKind, this._internalMeshDataInfo._sourcePositions, true);
                 if (this._internalMeshDataInfo._sourceNormals) {
-                    this.setVerticesData(VertexBuffer.NormalKind, this._internalMeshDataInfo._sourceNormals.slice(), true);
+                    this.setVerticesData(VertexBuffer.NormalKind, this._internalMeshDataInfo._sourceNormals, true);
                 }
+                this._internalMeshDataInfo._sourcePositions = null;
+                this._internalMeshDataInfo._sourceNormals = null;
             }
             this._internalAbstractMeshDataInfo._computeBonesUsingShaders = value;
             this._markSubMeshesAsAttributesDirty();
@@ -3754,7 +3756,7 @@ var Mesh = /** @class */ (function (_super) {
         return runCoroutineAsync(Mesh._MergeMeshesCoroutine(meshes, disposeSource, allow32BitsIndices, meshSubclass, subdivideWithSubMeshes, multiMultiMaterials, true), createYieldingScheduler());
     };
     Mesh._MergeMeshesCoroutine = function (meshes, disposeSource, allow32BitsIndices, meshSubclass, subdivideWithSubMeshes, multiMultiMaterials, isAsync) {
-        var index, totalVertices, materialArray, materialIndexArray, indiceArray, mesh, material, matIndex, subIndex, subIndex, subIndex, source, getVertexDataFromMesh, _a, sourceVertexData, sourceTransform, meshVertexDatas, i, mergeCoroutine, mergeCoroutineStep, vertexData, applyToCoroutine, applyToCoroutineStep, offset, _i, _b, subMesh, newMultiMaterial, subIndex;
+        var index, totalVertices, materialArray, materialIndexArray, indiceArray, currentOverrideMaterialSideOrientation, mesh, material, matIndex, subIndex, subIndex, subIndex, source, getVertexDataFromMesh, _a, sourceVertexData, sourceTransform, meshVertexDatas, i, mergeCoroutine, mergeCoroutineStep, vertexData, applyToCoroutine, applyToCoroutineStep, offset, _i, _b, subMesh, newMultiMaterial, subIndex;
         if (disposeSource === void 0) { disposeSource = true; }
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -3781,12 +3783,17 @@ var Mesh = /** @class */ (function (_super) {
                     materialArray = new Array();
                     materialIndexArray = new Array();
                     indiceArray = new Array();
+                    currentOverrideMaterialSideOrientation = meshes[0].overrideMaterialSideOrientation;
                     for (index = 0; index < meshes.length; index++) {
                         mesh = meshes[index];
                         if (mesh.isAnInstance) {
                             Logger.Warn("Cannot merge instance meshes.");
                             return [2 /*return*/, null];
                         }
+                        if (currentOverrideMaterialSideOrientation !== mesh.overrideMaterialSideOrientation) {
+                            Logger.Warn("Cannot merge meshes with different overrideMaterialSideOrientation values.");
+                            return [2 /*return*/, null];
+                        }
                         if (subdivideWithSubMeshes) {
                             indiceArray.push(mesh.getTotalIndices());
                         }
@@ -3884,6 +3891,7 @@ var Mesh = /** @class */ (function (_super) {
                 case 14:
                     // Setting properties
                     meshSubclass.checkCollisions = source.checkCollisions;
+                    meshSubclass.overrideMaterialSideOrientation = source.overrideMaterialSideOrientation;
                     // Cleaning
                     if (disposeSource) {
                         for (index = 0; index < meshes.length; index++) {