Merge remote-tracking branch 'origin/master' into 1.13

# Conflicts:
#	Source/Engine/GraphicsDevice/Vulkan/GPUSwapChainVulkan.cpp
This commit is contained in:
2026-08-05 08:12:00 +02:00
38 changed files with 1420 additions and 120 deletions
+3 -3
View File
@@ -1309,10 +1309,10 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
}
break;
case ModelType::SkinnedModel:
if (data.LODs.Count() > 1)
if (data.LODs.IsEmpty() || data.LODs[0].Meshes.IsEmpty())
{
LOG(Warning, "Imported skinned model has more than one LOD. Removing the lower LODs. Only single one is supported.");
data.LODs.Resize(1);
errorMsg = TEXT("Imported skinned model has no valid geometry.");
return true;
}
break;
case ModelType::Animation: