From 7a0e5b4af74e015f19887bf2296d64e208a7d930 Mon Sep 17 00:00:00 2001 From: KillzXGaming Date: Thu, 16 May 2019 17:47:45 -0400 Subject: [PATCH] Load texture type for hint in material editor --- .vs/Switch_Toolbox/v15/.suo | Bin 1278464 -> 1278464 bytes .../GUI/BFRES/Materials/SamplerEditor.cs | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index 4c01d316dd1dd0fdd3a675cb844dc8c19cbd7db3..98e27200253b8f86568539dfededf402fe7a4726 100644 GIT binary patch delta 5628 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 delta 4999 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 Aod5s; diff --git a/Switch_FileFormatsMain/GUI/BFRES/Materials/SamplerEditor.cs b/Switch_FileFormatsMain/GUI/BFRES/Materials/SamplerEditor.cs index 130b00f5..62cec07d 100644 --- a/Switch_FileFormatsMain/GUI/BFRES/Materials/SamplerEditor.cs +++ b/Switch_FileFormatsMain/GUI/BFRES/Materials/SamplerEditor.cs @@ -196,6 +196,8 @@ namespace FirstPlugin.Forms MatTexture matTex = (MatTexture)material.TextureMaps[index]; + samplerHintTB.Text = matTex.Type.ToString(); + string name = matTex.Name; textureNameTB.Text = name; @@ -373,7 +375,7 @@ namespace FirstPlugin.Forms var index = textureRefListView.SelectedIndices[0]; - samplerHintTB.Text = GetHint(samplerHintTB.Text); + // samplerHintTB.Text = GetHint(samplerHintTB.Text); bool IsDuped = false;