瀏覽代碼

Merge pull request #6985 from julien-moreau/master

Material Node texture blocks now check rootUrl to avoid loading embed…
David Catuhe 5 年之前
父節點
當前提交
361c9ae2ad

+ 1 - 0
src/Materials/Node/Blocks/Dual/reflectionTextureBlock.ts

@@ -430,6 +430,7 @@ export class ReflectionTextureBlock extends NodeMaterialBlock {
         super._deserialize(serializationObject, scene, rootUrl);
 
         if (serializationObject.texture) {
+            rootUrl = serializationObject.texture.url.indexOf("data:") === 0 ? rootUrl : "";
             if (serializationObject.texture.isCube) {
                 this.texture = CubeTexture.Parse(serializationObject.texture, scene, rootUrl);
             } else {

+ 1 - 0
src/Materials/Node/Blocks/Dual/textureBlock.ts

@@ -375,6 +375,7 @@ export class TextureBlock extends NodeMaterialBlock {
         super._deserialize(serializationObject, scene, rootUrl);
 
         if (serializationObject.texture) {
+            rootUrl = serializationObject.texture.url.indexOf("data:") === 0 ? rootUrl : "";
             this.texture = Texture.Parse(serializationObject.texture, scene, rootUrl) as Texture;
         }
     }