Merge pull request #7901 from BabylonJS/master

Nightly

dist/preview release/packagesSizeBaseLine.json

@@ -1 +1 @@
-{"thinEngineOnly":114615,"engineOnly":151244,"sceneOnly":508634,"minGridMaterial":640495,"minStandardMaterial":781566}
+{"thinEngineOnly":114615,"engineOnly":151244,"sceneOnly":508634,"minGridMaterial":640495,"minStandardMaterial":781670}

src/Materials/Textures/texture.ts

@@ -592,12 +592,17 @@ export class Texture extends BaseTexture {
      */
     public serialize(): any {
         let savedName = this.name;
+
         if (!Texture.SerializeBuffers) {
             if (StringTools.StartsWith(this.name, "data:")) {
                 this.name = "";
             }
         }
 
+        if (StringTools.StartsWith(this.name, "data:") && this.url === this.name) {
+            this.url = "";
+        }
+
         var serializationObject = super.serialize();
 
         if (!serializationObject) {
@@ -705,7 +710,7 @@ export class Texture extends BaseTexture {
                 } else {
                     let url = rootUrl + parsedTexture.name;
 
-                    if (Texture.UseSerializedUrlIfAny && parsedTexture.url) {
+                    if (StringTools.StartsWith(parsedTexture.url, "data:") || (Texture.UseSerializedUrlIfAny && parsedTexture.url)) {
                         url = parsedTexture.url;
                     }
                     texture = new Texture(url, scene, !generateMipMaps, parsedTexture.invertY);

src/Misc/stringTools.ts

@@ -19,6 +19,9 @@ export class StringTools {
      * @returns Boolean indicating whether the suffix was found (true) or not (false)
      */
     public static StartsWith(str: string, suffix: string): boolean {
+        if (!str) {
+            return false;
+        }
         return str.indexOf(suffix) === 0;
     }