Merge pull request #1 from lyuma/fix2018

MerlinVR · web-flow · commit 3ca9e8f49858 · 2020-05-26T22:26:52.000-07:00
Compile fix for unity 2018
diff --git a/Merlin/Scripts/MSDFAtlasGenerator.cs b/Merlin/Scripts/MSDFAtlasGenerator.cs
@@ -161,7 +161,7 @@ private void GenerateAtlas()
         if (UseTextureCompression)
         {
             EditorUtility.DisplayProgressBar("Generating MSDF Atlas...", "Compressing Atlas...", 1f);
-            EditorUtility.CompressTexture(newAtlas, TextureFormat.BC7, TextureCompressionQuality.Best);
+            EditorUtility.CompressTexture(newAtlas, TextureFormat.BC7, UnityEditor.TextureCompressionQuality.Best);
         }
 
         EditorUtility.ClearProgressBar();

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ private void GenerateAtlas()`
`161`	`161`	`if (UseTextureCompression)`
`162`	`162`	`{`
`163`	`163`	`EditorUtility.DisplayProgressBar("Generating MSDF Atlas...", "Compressing Atlas...", 1f);`
`164`		`- EditorUtility.CompressTexture(newAtlas, TextureFormat.BC7, TextureCompressionQuality.Best);`
	`164`	`+ EditorUtility.CompressTexture(newAtlas, TextureFormat.BC7, UnityEditor.TextureCompressionQuality.Best);`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`EditorUtility.ClearProgressBar();`