drewcassidy/KSP-Conformal-Decals
1
0
Fork 0
mirror of https://github.com/drewcassidy/KSP-Conformal-Decals.git synced 2024-06-11 05:54:07 +00:00
Code Issues Releases Wiki Activity

Fix texture initialization

Browse Source
This commit is contained in:
Andrew Cassidy 2020-07-13 18:04:10 -07:00
parent 198df83e16
commit ac617748cb
No known key found for this signature in database
GPG Key ID: 963017B38FD477A1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GameData/ConformalDecals/Plugins/ConformalDecals.dll
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:f79052b6a482ee65c85deb7ce55d67b6b2353f34b67ea30d2fe9677498cca4f6 oid sha256:5b9c33ef108042edb665edc7b7f143f9ecc35d2524a7a6c7df9b144690d1c471
size 45056 size 45056

6
Source/ConformalDecals/MaterialProperties/MaterialTextureProperty.cs
View File

@ -10,7 +10,7 @@ namespace ConformalDecals.MaterialProperties {
[SerializeField] public bool autoTile; [SerializeField] public bool autoTile;
[SerializeField] private string _textureUrl; [SerializeField] private string _textureUrl;
[SerializeField] private Texture2D _texture = Texture2D.whiteTexture; [SerializeField] private Texture2D _texture;
[SerializeField] private bool _hasTile; [SerializeField] private bool _hasTile;
[SerializeField] private Rect _tileRect; [SerializeField] private Rect _tileRect;
@ -55,6 +55,10 @@ namespace ConformalDecals.MaterialProperties {
if (ParseUtil.ParseStringIndirect(ref _textureUrl, node, "textureUrl")) { if (ParseUtil.ParseStringIndirect(ref _textureUrl, node, "textureUrl")) {
_texture = LoadTexture(_textureUrl, isNormal); _texture = LoadTexture(_textureUrl, isNormal);
} }
if (_texture == null) {
_texture = isNormal ? DecalConfig.BlankNormal : Texture2D.whiteTexture;
}
} }
public override void Modify(Material material) { public override void Modify(Material material) {