From dda988db17b754d77d111b2ef255f451baed90b2 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Sun, 29 Nov 2020 16:31:41 -0800 Subject: [PATCH] Quick bugfix --- .../Plugins/ConformalDecals.dll | Bin 82432 -> 82432 bytes .../Versioning/ConformalDecals.version | 2 +- .../MaterialTextureProperty.cs | 3 +-- .../ConformalDecals/ModuleConformalDecal.cs | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/GameData/ConformalDecals/Plugins/ConformalDecals.dll index d5b67899afec1638443de3402576f5733c746290..f519f6acf5a1ee2f3390261e5efcc6fc08f67a2a 100644 GIT binary patch delta 5858 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 delta 5857 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 diff --git a/GameData/ConformalDecals/Versioning/ConformalDecals.version b/GameData/ConformalDecals/Versioning/ConformalDecals.version index 503d33d..4dfbdd5 100644 --- a/GameData/ConformalDecals/Versioning/ConformalDecals.version +++ b/GameData/ConformalDecals/Versioning/ConformalDecals.version @@ -7,7 +7,7 @@ "MAJOR":0, "MINOR":2, "PATCH":6, - "BUILD":0 + "BUILD":1 }, "KSP_VERSION": { diff --git a/Source/ConformalDecals/MaterialProperties/MaterialTextureProperty.cs b/Source/ConformalDecals/MaterialProperties/MaterialTextureProperty.cs index 9f578c4..9a096aa 100644 --- a/Source/ConformalDecals/MaterialProperties/MaterialTextureProperty.cs +++ b/Source/ConformalDecals/MaterialProperties/MaterialTextureProperty.cs @@ -45,8 +45,7 @@ namespace ConformalDecals.MaterialProperties { get { if (_texture == null) return 1; if (_textureUrl?.Contains("Squad/Flags") == true) return 0.625f; - if (_hasTile) return MaskedHeight / (float) MaskedWidth; - return _texture.height / _texture.width; + return MaskedHeight / (float) MaskedWidth; } } diff --git a/Source/ConformalDecals/ModuleConformalDecal.cs b/Source/ConformalDecals/ModuleConformalDecal.cs index 8181a87..64bc2a8 100644 --- a/Source/ConformalDecals/ModuleConformalDecal.cs +++ b/Source/ConformalDecals/ModuleConformalDecal.cs @@ -400,7 +400,7 @@ namespace ConformalDecals { protected void UpdateScale() { scale = Mathf.Max(0.01f, scale); depth = Mathf.Max(0.01f, depth); - var aspectRatio = materialProperties.AspectRatio; + var aspectRatio = Mathf.Max(0.01f, materialProperties.AspectRatio); Vector2 size; switch (scaleMode) {