api: Remove object type from material converter.

freezy · freezy · commit 6edececbc3fa · 2021-09-13T23:25:28.000+02:00
diff --git a/Runtime/MaterialConverter.cs b/Runtime/MaterialConverter.cs
@@ -69,8 +69,7 @@ public static Material GetDefaultMaterial(BlendMode blendMode)
 			}
 		}
 
-		public Material CreateMaterial(PbrMaterial vpxMaterial, ITextureProvider textureProvider, Type objectType,
-			StringBuilder debug = null)
+		public Material CreateMaterial(PbrMaterial vpxMaterial, ITextureProvider textureProvider, StringBuilder debug = null)
 		{
 			Material defaultMaterial = GetDefaultMaterial(vpxMaterial.MapBlendMode);
 
@@ -130,7 +129,7 @@ public Material CreateMaterial(PbrMaterial vpxMaterial, ITextureProvider texture
 
 		public Material MergeMaterials(PbrMaterial vpxMaterial, Material texturedMaterial)
 		{
-			var nonTexturedMaterial = CreateMaterial(vpxMaterial, null, null);
+			var nonTexturedMaterial = CreateMaterial(vpxMaterial, null);
 			var mergedMaterial = new Material(GetShader());
 			mergedMaterial.CopyPropertiesFromMaterial(texturedMaterial);
 

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,7 @@ public static Material GetDefaultMaterial(BlendMode blendMode)`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- public Material CreateMaterial(PbrMaterial vpxMaterial, ITextureProvider textureProvider, Type objectType,`
`73`		`- StringBuilder debug = null)`
	`72`	`+ public Material CreateMaterial(PbrMaterial vpxMaterial, ITextureProvider textureProvider, StringBuilder debug = null)`
`74`	`73`	`{`
`75`	`74`	`Material defaultMaterial = GetDefaultMaterial(vpxMaterial.MapBlendMode);`
`76`	`75`
`@@ -130,7 +129,7 @@ public Material CreateMaterial(PbrMaterial vpxMaterial, ITextureProvider texture`
`130`	`129`
`131`	`130`	`public Material MergeMaterials(PbrMaterial vpxMaterial, Material texturedMaterial)`
`132`	`131`	`{`
`133`		`- var nonTexturedMaterial = CreateMaterial(vpxMaterial, null, null);`
	`132`	`+ var nonTexturedMaterial = CreateMaterial(vpxMaterial, null);`
`134`	`133`	`var mergedMaterial = new Material(GetShader());`
`135`	`134`	`mergedMaterial.CopyPropertiesFromMaterial(texturedMaterial);`
`136`	`135`