From cfcf71f051a48af944252c31b64a842c237f84dc Mon Sep 17 00:00:00 2001 From: Turanszki Janos Date: Tue, 29 Dec 2020 21:21:34 +0100 Subject: [PATCH] editor fix --- Editor/MaterialWindow.cpp | 2 ++ Editor/MeshWindow.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Editor/MaterialWindow.cpp b/Editor/MaterialWindow.cpp index 069c4e2ad..ad87462b9 100644 --- a/Editor/MaterialWindow.cpp +++ b/Editor/MaterialWindow.cpp @@ -925,6 +925,7 @@ void MaterialWindow::SetEntity(Entity entity) texture_displacement_Button.SetText(wiHelper::GetFileNameFromPath(material->displacementMapName)); texture_emissive_Button.SetText(wiHelper::GetFileNameFromPath(material->emissiveMapName)); texture_occlusion_Button.SetText(wiHelper::GetFileNameFromPath(material->occlusionMapName)); + texture_transmission_Button.SetText(wiHelper::GetFileNameFromPath(material->transmissionMapName)); texture_baseColor_uvset_Field.SetText(std::to_string(material->uvset_baseColorMap)); texture_normal_uvset_Field.SetText(std::to_string(material->uvset_normalMap)); @@ -932,6 +933,7 @@ void MaterialWindow::SetEntity(Entity entity) texture_displacement_uvset_Field.SetText(std::to_string(material->uvset_displacementMap)); texture_emissive_uvset_Field.SetText(std::to_string(material->uvset_emissiveMap)); texture_occlusion_uvset_Field.SetText(std::to_string(material->uvset_occlusionMap)); + texture_transmission_uvset_Field.SetText(std::to_string(material->uvset_transmissionMap)); colorComboBox.SetEnabled(true); diff --git a/Editor/MeshWindow.cpp b/Editor/MeshWindow.cpp index 23d479bdf..f0d727aee 100644 --- a/Editor/MeshWindow.cpp +++ b/Editor/MeshWindow.cpp @@ -76,7 +76,7 @@ struct TerraGen : public wiWindow void MeshWindow::Create(EditorComponent* editor) { wiWindow::Create("Mesh Window"); - SetSize(XMFLOAT2(580, 500)); + SetSize(XMFLOAT2(580, 520)); float x = 150; float y = 0;