From 4f411f7650c7b2a3e0654081e0320c3f6540b1bb Mon Sep 17 00:00:00 2001 From: spimort Date: Tue, 17 Sep 2024 21:25:34 -0400 Subject: [PATCH] Fix the decal with a wrong rotation (#136) --- addons/terrabrush/Scripts/BrushDecal.cs | 2 -- addons/terrabrush/Scripts/EditorResources/TextureSetResource.cs | 2 +- addons/terrabrush/Scripts/TerrainControlDock.cs | 2 -- addons/terrabrush/plugin.cfg | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/addons/terrabrush/Scripts/BrushDecal.cs b/addons/terrabrush/Scripts/BrushDecal.cs index 7576713..4a7878e 100644 --- a/addons/terrabrush/Scripts/BrushDecal.cs +++ b/addons/terrabrush/Scripts/BrushDecal.cs @@ -18,8 +18,6 @@ public void SetSize(int size) { public void SetBrushImage(Image image) { var imageCopy = new Image(); imageCopy.CopyFrom(image); - imageCopy.FlipY(); - imageCopy.FlipX(); for (var x = 0; x < imageCopy.GetWidth(); x++) { for (var y = 0; y < imageCopy.GetHeight(); y++) { diff --git a/addons/terrabrush/Scripts/EditorResources/TextureSetResource.cs b/addons/terrabrush/Scripts/EditorResources/TextureSetResource.cs index 84d55c6..c1cb939 100644 --- a/addons/terrabrush/Scripts/EditorResources/TextureSetResource.cs +++ b/addons/terrabrush/Scripts/EditorResources/TextureSetResource.cs @@ -17,7 +17,7 @@ [Export] public Texture2D AlbedoTexture { get { return _albedoTexture; } set { - if (value != null && value.ResourcePath != _albedoTexture?.ResourcePath) { + if (value != null && !string.IsNullOrWhiteSpace(value.ResourcePath) && value.ResourcePath != _albedoTexture?.ResourcePath) { var directory = value.ResourcePath.Replace(System.IO.Path.GetFileName(value.ResourcePath), ""); var directoryFiles = DirAccess.GetFilesAt(directory); diff --git a/addons/terrabrush/Scripts/TerrainControlDock.cs b/addons/terrabrush/Scripts/TerrainControlDock.cs index 1e587a9..6bc3b09 100644 --- a/addons/terrabrush/Scripts/TerrainControlDock.cs +++ b/addons/terrabrush/Scripts/TerrainControlDock.cs @@ -92,8 +92,6 @@ private void UpdateSelectedBrush() { } var brushImage = ((DockPreviewButton) brushesPreview[_selectedBrushIndex]).ButtonImage.GetImage(); - brushImage.FlipY(); - brushImage.FlipX(); TerraBrush?.SetCurrentBrush(_selectedBrushIndex, brushImage); BrushDecal?.SetBrushImage(brushImage); } diff --git a/addons/terrabrush/plugin.cfg b/addons/terrabrush/plugin.cfg index 3d14c9b..5f82e8d 100644 --- a/addons/terrabrush/plugin.cfg +++ b/addons/terrabrush/plugin.cfg @@ -3,5 +3,5 @@ name="TerraBrush" description="" author="spimort" -version="0.8.3-alpha" +version="0.8.4-alpha" script="Plugin.cs"