Weber, Raanan пре 9 година
родитељ
комит
5c02b84723

+ 3 - 3
materialsLibrary/materials/lava/babylon.lavaMaterial.ts

@@ -571,7 +571,7 @@ module BABYLON {
                 serializationObject.diffuseTexture = this.diffuseTexture.serialize();
             }
             if (this.noiseTexture) {
-                serializationObject.diffuseTexture = this.noiseTexture.serialize();
+                serializationObject.noiseTexture = this.noiseTexture.serialize();
             }
 
             return serializationObject;
@@ -596,11 +596,11 @@ module BABYLON {
             material.wireframe = source.wireframe;
 
             if (source.diffuseTexture) {
-                material.diffuseTexture = Texture.ParseTexture(source.diffuseTexture, scene, rootUrl);
+                material.diffuseTexture = Texture.Parse(source.diffuseTexture, scene, rootUrl);
             }
 
             if (source.noiseTexture) {
-                material.noiseTexture = Texture.ParseTexture(source.noiseTexture, scene, rootUrl);
+                material.noiseTexture = Texture.Parse(source.noiseTexture, scene, rootUrl);
             }
 
             if (source.checkReadyOnlyOnce) {

+ 2 - 2
materialsLibrary/materials/water/babylon.waterMaterial.ts

@@ -745,7 +745,7 @@ module BABYLON {
             return serializationObject;
         }
 
-        public static Parse(source: any, scene: Scene, rootUrl: string): LavaMaterial {
+        public static Parse(source: any, scene: Scene, rootUrl: string): WaterMaterial {
 		
 			var renderTargetSize = source.renderTargetSize ? Vector2.FromArray(source.renderTargetSize) : null;
 		
@@ -773,7 +773,7 @@ module BABYLON {
             material.wireframe = source.wireframe;
 
             if (source.bumpTexture) {
-                material.bumpTexture = Texture.ParseTexture(source.bumpTexture, scene, rootUrl);
+                material.bumpTexture = Texture.Parse(source.bumpTexture, scene, rootUrl);
             }
 
             if (source.checkReadyOnlyOnce) {