浏览代码

Fixed pbr material serialization and fixed legacy pbr check in Material.ts

Julien Moreau-Mathis 8 年之前
父节点
当前提交
04f0bb06ae
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      materialsLibrary/src/legacyPBR/babylon.legacyPBRMaterial.ts
  2. 2 2
      src/Materials/babylon.material.ts

+ 1 - 1
materialsLibrary/src/legacyPBR/babylon.legacyPBRMaterial.ts

@@ -1689,7 +1689,7 @@ module BABYLON {
 
         public serialize(): any {
             var serializationObject = SerializationHelper.Serialize(this);
-            serializationObject.customType = "BABYLON.legacyPBRMaterial";
+            serializationObject.customType = "BABYLON.LegacyPBRMaterial";
             return serializationObject;
         }
 

+ 2 - 2
src/Materials/babylon.material.ts

@@ -589,8 +589,8 @@
             }
 
             if (parsedMaterial.customType === "BABYLON.PBRMaterial" && !parsedMaterial.overloadedAlbedo) {
-                parsedMaterial.customType === "BABYLON.legacyPBRMaterial";
-                if (!(<any>BABYLON).legacyPBRMaterial) {
+                parsedMaterial.customType = "BABYLON.LegacyPBRMaterial";
+                if (!(<any>BABYLON).LegacyPBRMaterial) {
                     BABYLON.Tools.Error("Your scene is trying to load a legacy version of the PBRMaterial, please, include it from the materials library.");
                     return;
                 }