@babylonjs/core 5.0.0-alpha.61 → 5.0.0-alpha.62

package/Meshes/abstractMesh.js

@@ -517,6 +517,7 @@ var AbstractMesh = /** @class */ (function (_super) {
             if (!this.subMeshes) {
                 return;
             }
+            this.resetDrawCache();
             this._unBindEffect();
         },
         enumerable: false,
@@ -1326,6 +1327,28 @@ var AbstractMesh = /** @class */ (function (_super) {
                 }
             }
         }
+        if (data && applyMorph && this.morphTargetManager) {
+            var faceIndexCount = 0;
+            var positionIndex = 0;
+            for (var vertexCount = 0; vertexCount < data.length; vertexCount++) {
+                for (var targetCount = 0; targetCount < this.morphTargetManager.numTargets; targetCount++) {
+                    var targetMorph = this.morphTargetManager.getTarget(targetCount);
+                    var influence = targetMorph.influence;
+                    if (influence > 0.0) {
+                        var morphTargetPositions = targetMorph.getPositions();
+                        if (morphTargetPositions) {
+                            data[vertexCount] += (morphTargetPositions[vertexCount] - data[vertexCount]) * influence;
+                        }
+                    }
+                }
+                faceIndexCount++;
+                if (this._positions && faceIndexCount === 3) { // We want to merge into positions every 3 indices starting (but not 0)
+                    faceIndexCount = 0;
+                    var index_1 = positionIndex * 3;
+                    this._positions[positionIndex++].copyFromFloats(data[index_1], data[index_1 + 1], data[index_1 + 2]);
+                }
+            }
+        }
         if (data && applySkeleton && this.skeleton) {
             var matricesIndicesData = this.getVerticesData(VertexBuffer.MatricesIndicesKind);
             var matricesWeightsData = this.getVerticesData(VertexBuffer.MatricesWeightsKind);
@@ -1367,28 +1390,6 @@ var AbstractMesh = /** @class */ (function (_super) {
                 }
             }
         }
-        if (data && applyMorph && this.morphTargetManager) {
-            var faceIndexCount = 0;
-            var positionIndex = 0;
-            for (var vertexCount = 0; vertexCount < data.length; vertexCount++) {
-                for (var targetCount = 0; targetCount < this.morphTargetManager.numTargets; targetCount++) {
-                    var targetMorph = this.morphTargetManager.getTarget(targetCount);
-                    var influence = targetMorph.influence;
-                    if (influence > 0.0) {
-                        var morphTargetPositions = targetMorph.getPositions();
-                        if (morphTargetPositions) {
-                            data[vertexCount] += (morphTargetPositions[vertexCount] - data[vertexCount]) * influence;
-                        }
-                    }
-                }
-                faceIndexCount++;
-                if (this._positions && faceIndexCount === 3) { // We want to merge into positions every 3 indices starting (but not 0)
-                    faceIndexCount = 0;
-                    var index_1 = positionIndex * 3;
-                    this._positions[positionIndex++].copyFromFloats(data[index_1], data[index_1 + 1], data[index_1 + 2]);
-                }
-            }
-        }
         return data;
     };
     /** @hidden */