Merge

dist/preview release/babylon.max.js

@@ -10113,18 +10113,18 @@ var BABYLON;
          * @param updateFunc defines the callback function used to get the final value from the selected gradients
          */
         Tools.GetCurrentGradient = function (ratio, gradients, updateFunc) {
-            if (gradients.length === 1) {
-                updateFunc(gradients[0], gradients[0], 0);
-                return;
-            }
             for (var gradientIndex = 0; gradientIndex < gradients.length - 1; gradientIndex++) {
                 var currentGradient = gradients[gradientIndex];
                 var nextGradient = gradients[gradientIndex + 1];
                 if (ratio >= currentGradient.gradient && ratio <= nextGradient.gradient) {
                     var scale = (ratio - currentGradient.gradient) / (nextGradient.gradient - currentGradient.gradient);
                     updateFunc(currentGradient, nextGradient, scale);
+                    return;
                 }
             }
+            // Use last index if over
+            var lastIndex = gradients.length - 1;
+            updateFunc(gradients[lastIndex], gradients[lastIndex], 1.0);
         };
         Tools.BaseUrl = "";
         Tools.DefaultRetryStrategy = RetryStrategy.ExponentialBackoff();
@@ -33619,7 +33619,12 @@ var BABYLON;
                         instance.id = parsedInstance.id;
                     }
                     if (BABYLON.Tags) {
-                        BABYLON.Tags.AddTagsTo(instance, parsedInstance.tags);
+                        if (parsedInstance.tags) {
+                            BABYLON.Tags.AddTagsTo(instance, parsedInstance.tags);
+                        }
+                        else {
+                            BABYLON.Tags.AddTagsTo(instance, parsedMesh.tags);
+                        }
                     }
                     instance.position = BABYLON.Vector3.FromArray(parsedInstance.position);
                     if (parsedInstance.parentId) {

dist/preview release/babylon.no-module.max.js

@@ -10080,18 +10080,18 @@ var BABYLON;
          * @param updateFunc defines the callback function used to get the final value from the selected gradients
          */
         Tools.GetCurrentGradient = function (ratio, gradients, updateFunc) {
-            if (gradients.length === 1) {
-                updateFunc(gradients[0], gradients[0], 0);
-                return;
-            }
             for (var gradientIndex = 0; gradientIndex < gradients.length - 1; gradientIndex++) {
                 var currentGradient = gradients[gradientIndex];
                 var nextGradient = gradients[gradientIndex + 1];
                 if (ratio >= currentGradient.gradient && ratio <= nextGradient.gradient) {
                     var scale = (ratio - currentGradient.gradient) / (nextGradient.gradient - currentGradient.gradient);
                     updateFunc(currentGradient, nextGradient, scale);
+                    return;
                 }
             }
+            // Use last index if over
+            var lastIndex = gradients.length - 1;
+            updateFunc(gradients[lastIndex], gradients[lastIndex], 1.0);
         };
         Tools.BaseUrl = "";
         Tools.DefaultRetryStrategy = RetryStrategy.ExponentialBackoff();
@@ -33586,7 +33586,12 @@ var BABYLON;
                         instance.id = parsedInstance.id;
                     }
                     if (BABYLON.Tags) {
-                        BABYLON.Tags.AddTagsTo(instance, parsedInstance.tags);
+                        if (parsedInstance.tags) {
+                            BABYLON.Tags.AddTagsTo(instance, parsedInstance.tags);
+                        }
+                        else {
+                            BABYLON.Tags.AddTagsTo(instance, parsedMesh.tags);
+                        }
                     }
                     instance.position = BABYLON.Vector3.FromArray(parsedInstance.position);
                     if (parsedInstance.parentId) {

dist/preview release/es6.js

@@ -10080,18 +10080,18 @@ var BABYLON;
          * @param updateFunc defines the callback function used to get the final value from the selected gradients
          */
         Tools.GetCurrentGradient = function (ratio, gradients, updateFunc) {
-            if (gradients.length === 1) {
-                updateFunc(gradients[0], gradients[0], 0);
-                return;
-            }
             for (var gradientIndex = 0; gradientIndex < gradients.length - 1; gradientIndex++) {
                 var currentGradient = gradients[gradientIndex];
                 var nextGradient = gradients[gradientIndex + 1];
                 if (ratio >= currentGradient.gradient && ratio <= nextGradient.gradient) {
                     var scale = (ratio - currentGradient.gradient) / (nextGradient.gradient - currentGradient.gradient);
                     updateFunc(currentGradient, nextGradient, scale);
+                    return;
                 }
             }
+            // Use last index if over
+            var lastIndex = gradients.length - 1;
+            updateFunc(gradients[lastIndex], gradients[lastIndex], 1.0);
         };
         Tools.BaseUrl = "";
         Tools.DefaultRetryStrategy = RetryStrategy.ExponentialBackoff();
@@ -33586,7 +33586,12 @@ var BABYLON;
                         instance.id = parsedInstance.id;
                     }
                     if (BABYLON.Tags) {
-                        BABYLON.Tags.AddTagsTo(instance, parsedInstance.tags);
+                        if (parsedInstance.tags) {
+                            BABYLON.Tags.AddTagsTo(instance, parsedInstance.tags);
+                        }
+                        else {
+                            BABYLON.Tags.AddTagsTo(instance, parsedMesh.tags);
+                        }
                     }
                     instance.position = BABYLON.Vector3.FromArray(parsedInstance.position);
                     if (parsedInstance.parentId) {