Merge pull request #3044 from julien-moreau/master

 Now use "diffuse" instead of "diffuseColor" in materials in order to resolve conflicts with other materials when serializing/parsing

materialsLibrary/src/cell/babylon.cellMaterial.ts

@@ -32,7 +32,7 @@ module BABYLON {
         @expandToProperty("_markAllSubMeshesAsTexturesDirty")
         public diffuseTexture: BaseTexture;
 
-        @serializeAsColor3("diffuseColor")
+        @serializeAsColor3("diffuse")
         public diffuseColor = new Color3(1, 1, 1);
 
         @serialize("computeHighLevel")

materialsLibrary/src/fire/babylon.fireMaterial.ts

@@ -38,7 +38,7 @@ module BABYLON {
         @expandToProperty("_markAllSubMeshesAsTexturesDirty")
         public opacityTexture: Nullable<BaseTexture>;
         
-        @serialize("diffuseColor")
+        @serializeAsColor3("diffuse")
         public diffuseColor = new Color3(1, 1, 1);
         
         @serialize()

materialsLibrary/src/simple/babylon.simpleMaterial.ts

@@ -29,7 +29,7 @@ module BABYLON {
         @expandToProperty("_markAllSubMeshesAsTexturesDirty")
         public diffuseTexture: BaseTexture;
 
-        @serializeAsColor3("diffuseColor")
+        @serializeAsColor3("diffuse")
         public diffuseColor = new Color3(1, 1, 1);
         
         @serialize("disableLighting")