From 81be73ad8201c1127fc708ce140412a42bc9d685 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Mon, 15 Feb 2021 22:08:37 +0100 Subject: [PATCH] Fix spline model not drawing when using invalid material --- Source/Engine/Level/Actors/SplineModel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Engine/Level/Actors/SplineModel.cpp b/Source/Engine/Level/Actors/SplineModel.cpp index 01118ba6a..7fc623c8d 100644 --- a/Source/Engine/Level/Actors/SplineModel.cpp +++ b/Source/Engine/Level/Actors/SplineModel.cpp @@ -405,12 +405,12 @@ void SplineModel::Draw(RenderContext& renderContext) continue; // Select material - MaterialBase* material; + MaterialBase* material = nullptr; if (entry.Material && entry.Material->IsLoaded()) material = entry.Material; else if (slot.Material && slot.Material->IsLoaded()) material = slot.Material; - else + if (!material || !material->IsDeformable()) material = GPUDevice::Instance->GetDefaultDeformableMaterial(); if (!material || !material->IsDeformable()) continue;