Reset default brush to Light

my bad
icosa-foundation · Mar 26, 2024 · 452713d · 452713d
1 parent bd1bb0d
commit 452713d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git 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
@@ -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<Guid, Brush> m_GuidToBrush;
         private HashSet<Brush> 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<Brush> AllBrushes
         {