Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reset default brush to Light #664

Merged
merged 1 commit into from
Mar 26, 2024
Merged

Reset default brush to Light #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Assets/Scenes/Main.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
10 changes: 9 additions & 1 deletion Assets/Scripts/BrushCatalog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
{
Expand Down
Loading