From 002a460379c504adeefd53c55ed18cbeec043dc7 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Thu, 18 Apr 2024 18:53:21 -0400 Subject: [PATCH] Prevent crash in map editor when it loads an invalid plate model --- mapeditor/src/mapview.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mapeditor/src/mapview.cpp b/mapeditor/src/mapview.cpp index 352b818..84de4ba 100644 --- a/mapeditor/src/mapview.cpp +++ b/mapeditor/src/mapview.cpp @@ -37,13 +37,14 @@ void MapView::addTerrain(QString basePath, physis_Terrain terrain) auto plateMdlFile = physis_gamedata_extract_file(data, mdlPathStd.c_str()); auto plateMdl = physis_mdl_parse(plateMdlFile); - - mdlPart->addModel(plateMdl, - false, - glm::vec3(terrain.plates[i].position[0], 0.0f, terrain.plates[i].position[1]), - QStringLiteral("terapart%1").arg(i), - {}, - 0); + if (plateMdl.p_ptr != nullptr) { + mdlPart->addModel(plateMdl, + false, + glm::vec3(terrain.plates[i].position[0], 0.0f, terrain.plates[i].position[1]), + QStringLiteral("terapart%1").arg(i), + {}, + 0); + } } }