pengtaihao
/
SoftMaskForUGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge d5ddb2eea3 into b870d64b57

pull/147/merge
Scott Richmond 2023-01-20 00:09:02 +10:00 committed by GitHub
parent b870d64b57 d5ddb2eea3
commit fd84aa7079
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Scripts/SoftMaskable.cs
View File

@ -248,6 +248,8 @@ namespace Coffee.UISoftMask
#if UNITY_EDITOR #if UNITY_EDITOR
s_GameVPId = Shader.PropertyToID("_GameVP"); s_GameVPId = Shader.PropertyToID("_GameVP");
s_GameTVPId = Shader.PropertyToID("_GameTVP"); s_GameTVPId = Shader.PropertyToID("_GameTVP");
UnityEditor.SceneView.beforeSceneGui -= SceneView_beforeSceneGui; // For safety
UnityEditor.SceneView.beforeSceneGui += SceneView_beforeSceneGui;
#endif #endif
} }
@ -269,6 +271,9 @@ namespace Coffee.UISoftMask
MaterialCache.Unregister(_effectMaterialHash); MaterialCache.Unregister(_effectMaterialHash);
_effectMaterialHash = k_InvalidHash; _effectMaterialHash = k_InvalidHash;
#if UNITY_EDITOR
UnityEditor.SceneView.beforeSceneGui -= SceneView_beforeSceneGui;
#endif
} }
#if UNITY_EDITOR #if UNITY_EDITOR
@ -301,8 +306,11 @@ namespace Coffee.UISoftMask
Profiler.EndSample(); Profiler.EndSample();
} }
private void LateUpdate() private void SceneView_beforeSceneGui(UnityEditor.SceneView obj)
{ {
var parentCanvas = GetComponentInParent<Canvas>(); // Don't think we can cache this in case this go is moved to another parent
if (parentCanvas != null && parentCanvas.enabled) // Only do this expensive call if the UI element is active
UpdateMaterialForSceneView(modifiedMaterial); UpdateMaterialForSceneView(modifiedMaterial);
} }