From 452713d89bdfeacfe05ff3001b8bb80230d94479 Mon Sep 17 00:00:00 2001 From: Mike Nisbet Date: Tue, 26 Mar 2024 10:24:32 +0000 Subject: [PATCH] Reset default brush to Light my bad --- Assets/Scenes/Main.unity | 4 +++- Assets/Scripts/BrushCatalog.cs | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 5b0ce6989e..bc548ac0f7 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -10142,7 +10142,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_GlobalNoiseTexture: {fileID: 2800000, guid: 13d389131c327b94f84fbac121bf6f8f, type: 3} - m_DefaultBrush: {fileID: 11400000, guid: eb608f68fb3036b47be357a021ed7618, type: 2} + m_DefaultBrush: {fileID: 11400000, guid: b802f6ef146800b4bb78e9c705622cad, type: 2} + m_ZapboxDefaultBrush: {fileID: 11400000, guid: eb608f68fb3036b47be357a021ed7618, + type: 2} m_BlocksMaterials: - brushDescriptor: {fileID: 11400000, guid: 0e87b49c65463a343a448a556d7d6c3e, type: 2} - brushDescriptor: {fileID: 11400000, guid: d6c87eafa4cdba042933c1b4f6da46f7, type: 2} diff --git a/Assets/Scripts/BrushCatalog.cs b/Assets/Scripts/BrushCatalog.cs index f712d6b7f7..8964206fe8 100644 --- a/Assets/Scripts/BrushCatalog.cs +++ b/Assets/Scripts/BrushCatalog.cs @@ -60,6 +60,7 @@ public static void UnitTestTearDown(GameObject container) public Texture2D m_GlobalNoiseTexture; [SerializeField] private Brush m_DefaultBrush; + [SerializeField] private Brush m_ZapboxDefaultBrush; private bool m_IsLoading; private Dictionary m_GuidToBrush; private HashSet m_AllBrushes; @@ -82,7 +83,14 @@ public Brush GetBrush(Guid guid) } public Brush DefaultBrush { - get { return m_DefaultBrush; } + get + { +#if ZAPBOX_SUPPORTED + // TODO:Mikesky - Fix brush transparency! + return m_ZapboxDefaultBrush; +#endif + return m_DefaultBrush; + } } public IEnumerable AllBrushes {