stongcoder
diff --git a/‎Editor/Mono/BuildPipeline/AssemblyStripper.cs
Lines changed: 1 addition & 1 deletion b/‎Editor/Mono/BuildPipeline/AssemblyStripper.cs
Lines changed: 1 addition & 1 deletion
diff --git a/‎Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs
Lines changed: 2 additions & 2 deletions b/‎Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs
Lines changed: 2 additions & 2 deletions
diff --git a/‎Editor/Mono/EditorGUI.cs
Lines changed: 0 additions & 3 deletions b/‎Editor/Mono/EditorGUI.cs
Lines changed: 0 additions & 3 deletions
diff --git a/‎Editor/Mono/EditorGUIUtility.cs
Lines changed: 5 additions & 0 deletions b/‎Editor/Mono/EditorGUIUtility.cs
Lines changed: 5 additions & 0 deletions
@@ -46,7 +46,7 @@ private static string UnityLinkerPath
         {
             get
             {
-                return Path.Combine(IL2CPPUtils.GetIl2CppFolder(), "build/UnityLinker.exe");
+                return Path.Combine(IL2CPPUtils.GetIl2CppFolder(), "build/deploy/net471/UnityLinker.exe");
             }
         }
 
 
@@ -521,12 +521,12 @@ private void RunIl2CppWithArguments(List<string> arguments, Action<ProcessStartI
 
         private string GetIl2CppExe()
         {
-            return IL2CPPUtils.GetIl2CppFolder() + "/build/il2cpp.exe";
+            return IL2CPPUtils.GetIl2CppFolder() + "/build/deploy/net471/il2cpp.exe";
         }
 
         private string GetIl2CppCoreExe()
         {
-            return IL2CPPUtils.GetIl2CppFolder() + "/build/il2cppcore/il2cppcore.dll";
+            return IL2CPPUtils.GetIl2CppFolder() + "/build/deploy/il2cppcore/il2cppcore.dll";
         }
 
         private bool ShouldUseIl2CppCore()
 
@@ -6068,10 +6068,7 @@ internal static Texture2D transparentCheckerTexture
         private static Material GetPreviewMaterial(ref Material m, string shaderPath)
         {
             if (m == null)
-            {
                 m = new Material(EditorGUIUtility.LoadRequired(shaderPath) as Shader);
-                m.hideFlags = HideFlags.HideAndDontSave;
-            }
             return m;
         }
 
 
@@ -49,6 +49,7 @@ internal static Material GUITextureBlit2SRGBMaterial
                 {
                     Shader shader = LoadRequired("SceneView/GUITextureBlit2SRGB.shader") as Shader;
                     s_GUITextureBlit2SRGBMaterial = new Material(shader);
+                    s_GUITextureBlit2SRGBMaterial.hideFlags |= HideFlags.DontSaveInEditor;
                 }
                 s_GUITextureBlit2SRGBMaterial.SetFloat("_ManualTex2SRGB", QualitySettings.activeColorSpace == ColorSpace.Linear ? 1.0f : 0.0f);
                 return s_GUITextureBlit2SRGBMaterial;
@@ -64,6 +65,7 @@ internal static Material GUITextureBlitSceneGUIMaterial
                 {
                     Shader shader = LoadRequired("SceneView/GUITextureBlitSceneGUI.shader") as Shader;
                     s_GUITextureBlitSceneGUI = new Material(shader);
+                    s_GUITextureBlitSceneGUI.hideFlags |= HideFlags.DontSaveInEditor;
                 }
                 return s_GUITextureBlitSceneGUI;
             }
@@ -952,7 +954,10 @@ private static UnityObject Load(string filename, Type type)
 
             asset = bundle.LoadAsset(filename, type);
             if (asset != null)
+            {
+                asset.hideFlags |= HideFlags.HideAndDontSave;
                 return asset;
+            }
 
             return AssetDatabase.LoadAssetAtPath(filename, type);
         }
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ private static string UnityLinkerPath`
`46`	`46`	`{`
`47`	`47`	`get`
`48`	`48`	`{`
`49`		`- return Path.Combine(IL2CPPUtils.GetIl2CppFolder(), "build/UnityLinker.exe");`
	`49`	`+ return Path.Combine(IL2CPPUtils.GetIl2CppFolder(), "build/deploy/net471/UnityLinker.exe");`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -521,12 +521,12 @@ private void RunIl2CppWithArguments(List<string> arguments, Action<ProcessStartI`
`521`	`521`
`522`	`522`	`private string GetIl2CppExe()`
`523`	`523`	`{`
`524`		`- return IL2CPPUtils.GetIl2CppFolder() + "/build/il2cpp.exe";`
	`524`	`+ return IL2CPPUtils.GetIl2CppFolder() + "/build/deploy/net471/il2cpp.exe";`
`525`	`525`	`}`
`526`	`526`
`527`	`527`	`private string GetIl2CppCoreExe()`
`528`	`528`	`{`
`529`		`- return IL2CPPUtils.GetIl2CppFolder() + "/build/il2cppcore/il2cppcore.dll";`
	`529`	`+ return IL2CPPUtils.GetIl2CppFolder() + "/build/deploy/il2cppcore/il2cppcore.dll";`
`530`	`530`	`}`
`531`	`531`
`532`	`532`	`private bool ShouldUseIl2CppCore()`
Original file line number	Diff line number	Diff line change
`@@ -6068,10 +6068,7 @@ internal static Texture2D transparentCheckerTexture`
`6068`	`6068`	`private static Material GetPreviewMaterial(ref Material m, string shaderPath)`
`6069`	`6069`	`{`
`6070`	`6070`	`if (m == null)`
`6071`		`- {`
`6072`	`6071`	`m = new Material(EditorGUIUtility.LoadRequired(shaderPath) as Shader);`
`6073`		`- m.hideFlags = HideFlags.HideAndDontSave;`
`6074`		`- }`
`6075`	`6072`	`return m;`
`6076`	`6073`	`}`
`6077`	`6074`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ internal static Material GUITextureBlit2SRGBMaterial`
`49`	`49`	`{`
`50`	`50`	`Shader shader = LoadRequired("SceneView/GUITextureBlit2SRGB.shader") as Shader;`
`51`	`51`	`s_GUITextureBlit2SRGBMaterial = new Material(shader);`
	`52`	`+ s_GUITextureBlit2SRGBMaterial.hideFlags \|= HideFlags.DontSaveInEditor;`
`52`	`53`	`}`
`53`	`54`	`s_GUITextureBlit2SRGBMaterial.SetFloat("_ManualTex2SRGB", QualitySettings.activeColorSpace == ColorSpace.Linear ? 1.0f : 0.0f);`
`54`	`55`	`return s_GUITextureBlit2SRGBMaterial;`
`@@ -64,6 +65,7 @@ internal static Material GUITextureBlitSceneGUIMaterial`
`64`	`65`	`{`
`65`	`66`	`Shader shader = LoadRequired("SceneView/GUITextureBlitSceneGUI.shader") as Shader;`
`66`	`67`	`s_GUITextureBlitSceneGUI = new Material(shader);`
	`68`	`+ s_GUITextureBlitSceneGUI.hideFlags \|= HideFlags.DontSaveInEditor;`
`67`	`69`	`}`
`68`	`70`	`return s_GUITextureBlitSceneGUI;`
`69`	`71`	`}`
`@@ -952,7 +954,10 @@ private static UnityObject Load(string filename, Type type)`
`952`	`954`
`953`	`955`	`asset = bundle.LoadAsset(filename, type);`
`954`	`956`	`if (asset != null)`
	`957`	`+ {`
	`958`	`+ asset.hideFlags \|= HideFlags.HideAndDontSave;`
`955`	`959`	`return asset;`
	`960`	`+ }`
`956`	`961`
`957`	`962`	`return AssetDatabase.LoadAssetAtPath(filename, type);`
`958`	`963`	`}`