diff --git a/externals/LibCommon b/externals/LibCommon index 6399dbe9..4ff3ada3 160000 --- a/externals/LibCommon +++ b/externals/LibCommon @@ -1 +1 @@ -Subproject commit 6399dbe932c631d0f9e409de05b1f3bd77a5ed1e +Subproject commit 4ff3ada3457ec8d62f997d042a6008edabe5e212 diff --git a/src/Core/GameProject/CVirtualDirectory.cpp b/src/Core/GameProject/CVirtualDirectory.cpp index ec519b62..b35bfed3 100644 --- a/src/Core/GameProject/CVirtualDirectory.cpp +++ b/src/Core/GameProject/CVirtualDirectory.cpp @@ -414,5 +414,5 @@ bool CVirtualDirectory::IsValidDirectoryPath(TString Path) Path = Path.ChopBack(1); const TStringList Parts = Path.Split("/\\", true); - return std::all_of(Parts.cbegin(), Parts.cend(), IsValidDirectoryPath); + return std::all_of(Parts.cbegin(), Parts.cend(), IsValidDirectoryName); } diff --git a/src/Editor/ModelEditor/CModelEditorWindow.cpp b/src/Editor/ModelEditor/CModelEditorWindow.cpp index 90ae38a3..f1a6e5e3 100644 --- a/src/Editor/ModelEditor/CModelEditorWindow.cpp +++ b/src/Editor/ModelEditor/CModelEditorWindow.cpp @@ -118,6 +118,7 @@ CModelEditorWindow::CModelEditorWindow(CModel *pModel, QWidget *pParent) connect(ui->TevKAlphaSelComboBox, &QComboBox::currentIndexChanged, this, qOverload(&CModelEditorWindow::UpdateMaterial)); connect(ui->TevRasSelComboBox, &QComboBox::currentIndexChanged, this, qOverload(&CModelEditorWindow::UpdateMaterial)); connect(ui->TexCoordSrcComboBox, &QComboBox::currentIndexChanged, this, qOverload(&CModelEditorWindow::UpdateMaterial)); + connect(ui->IndTextureResSelector, &CResourceSelector::ResourceChanged, this, qOverload(&CModelEditorWindow::UpdateMaterial)); connect(ui->PassTextureResSelector, &CResourceSelector::ResourceChanged, this, qOverload(&CModelEditorWindow::UpdateMaterial)); connect(ui->TevColor1ComboBox, &QComboBox::currentIndexChanged, this, qOverload(&CModelEditorWindow::UpdateMaterial)); connect(ui->TevColor2ComboBox, &QComboBox::currentIndexChanged, this, qOverload(&CModelEditorWindow::UpdateMaterial));